From 8340f5cf6ada2bfa6fb4fb5d9708db5716086d42 Mon Sep 17 00:00:00 2001 From: yuyongle <1150359267@qq.com> Date: Fri, 22 Aug 2025 20:03:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=AE=A4=E7=AD=89bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectionRouteController.java | 12 +++--- .../controller/MeetAttachController.java | 10 ++--- .../TbVisitorManagementController.java | 2 +- .../mobile/MServiceWorkOrdersController.java | 2 +- .../property/domain/vo/CostHouseChargeVo.java | 4 ++ .../property/domain/vo/InspectionPointVo.java | 2 +- .../service/IServiceWorkOrdersService.java | 8 ++++ .../impl/CostCarChargeServiceImpl.java | 20 ++++++---- .../impl/CostHouseChargeServiceImpl.java | 16 ++++++-- .../impl/CustomerFeedbacksServiceImpl.java | 36 +++++++++-------- .../impl/InspectionPointServiceImpl.java | 12 +++++- .../service/impl/MeetBookingServiceImpl.java | 2 +- .../impl/ServiceWorkOrdersServiceImpl.java | 39 ++++++++++++++++--- 13 files changed, 114 insertions(+), 51 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java index 14b01122..81d91396 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/InspectionRouteController.java @@ -40,7 +40,7 @@ public class InspectionRouteController extends BaseController { /** * 查询巡检路线列表 */ - @SaCheckPermission("property:route:list") + @SaCheckPermission("property:inspectionRoute:list") @GetMapping("/list") public TableDataInfo list(InspectionRouteBo bo, PageQuery pageQuery) { return inspectionRouteService.queryPageList(bo, pageQuery); @@ -49,7 +49,7 @@ public class InspectionRouteController extends BaseController { /** * 导出巡检路线列表 */ - @SaCheckPermission("property:route:export") + @SaCheckPermission("property:inspectionRoute:export") @Log(title = "巡检路线", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(InspectionRouteBo bo, HttpServletResponse response) { @@ -62,7 +62,7 @@ public class InspectionRouteController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("property:route:query") + @SaCheckPermission("property:inspectionRoute:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -72,7 +72,7 @@ public class InspectionRouteController extends BaseController { /** * 新增巡检路线 */ - @SaCheckPermission("property:route:add") + @SaCheckPermission("property:inspectionRoute:add") @Log(title = "巡检路线", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +83,7 @@ public class InspectionRouteController extends BaseController { /** * 修改巡检路线 */ - @SaCheckPermission("property:route:edit") + @SaCheckPermission("property:inspectionRoute:edit") @Log(title = "巡检路线", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +96,7 @@ public class InspectionRouteController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("property:route:remove") + @SaCheckPermission("property:inspectionRoute:remove") @Log(title = "巡检路线", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetAttachController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetAttachController.java index ffa91146..623d5ccd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetAttachController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetAttachController.java @@ -40,7 +40,7 @@ public class MeetAttachController extends BaseController { /** * 查询分页会议室增值服务列表 */ - @SaCheckPermission("property:attach:list") + @SaCheckPermission("property:conferenceAddServices:list") @GetMapping("/list") public TableDataInfo pageList(MeetAttachBo bo, PageQuery pageQuery) { return meetAttachService.queryPageList(bo, pageQuery); @@ -57,7 +57,7 @@ public class MeetAttachController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("property:attach:query") + @SaCheckPermission("property:conferenceAddServices:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { @@ -67,7 +67,7 @@ public class MeetAttachController extends BaseController { /** * 新增会议室增值服务 */ - @SaCheckPermission("property:attach:add") + @SaCheckPermission("property:conferenceAddServices:add") @Log(title = "会议室增值服务", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -78,7 +78,7 @@ public class MeetAttachController extends BaseController { /** * 修改会议室增值服务 */ - @SaCheckPermission("property:attach:edit") + @SaCheckPermission("property:conferenceAddServices:edit") @Log(title = "会议室增值服务", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -91,7 +91,7 @@ public class MeetAttachController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("property:attach:remove") + @SaCheckPermission("property:conferenceAddServices:remove") @Log(title = "会议室增值服务", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java index 71cbd677..8c520540 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbVisitorManagementController.java @@ -152,7 +152,7 @@ public class TbVisitorManagementController extends BaseController { /** * pc端新增访客管理 */ - @SaCheckPermission("property:visitorManagement::addVisitorManagement") + @SaCheckPermission("property:visitorManagement:addVisitorManagement") @Log(title = "访客管理", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java index 4961fa12..3a8d3beb 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/mobile/MServiceWorkOrdersController.java @@ -45,7 +45,7 @@ public class MServiceWorkOrdersController extends BaseController { */ @GetMapping("/list") public TableDataInfo list(ServiceWorkOrdersBo bo, PageQuery pageQuery) { - return serviceWorkOrdersService.queryPageList(bo, pageQuery); + return serviceWorkOrdersService.queryMobilePageList(bo, pageQuery); } /** * 修改【工单处理】 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostHouseChargeVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostHouseChargeVo.java index 0cb4e6d5..29b63ee0 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostHouseChargeVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/CostHouseChargeVo.java @@ -46,6 +46,10 @@ public class CostHouseChargeVo implements Serializable { * 业主 */ private Long personId; + /** + * 业主 + */ + private String personName; /** * 收费项目 */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPointVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPointVo.java index 1ed2899e..0c688eb7 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPointVo.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/InspectionPointVo.java @@ -41,7 +41,7 @@ public class InspectionPointVo implements Serializable { * 巡检项目id */ @ExcelProperty(value = "巡检项目id") - private Long itemName; + private String itemName; /** * 巡检点名称 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java index c7ac8752..b5129f58 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IServiceWorkOrdersService.java @@ -94,4 +94,12 @@ public interface IServiceWorkOrdersService { * @return */ List> getServiceWorkOrdersHandler(String type); + /** + * 分页查询【工单处理】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【工单处理】分页列表 + */ + TableDataInfo queryMobilePageList(ServiceWorkOrdersBo bo, PageQuery pageQuery); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java index f7fd951d..7be26b05 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostCarChargeServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.property.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; @@ -16,15 +17,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.property.domain.CostCarCharge; import org.dromara.property.domain.CostPayFeeAudit; import org.dromara.property.domain.CostReturnPayFee; +import org.dromara.property.domain.ResidentPerson; import org.dromara.property.domain.bo.CostCarChargeBo; import org.dromara.property.domain.bo.CostChargeReturnFeeBo; import org.dromara.property.domain.enums.ChargeStatusEnum; import org.dromara.property.domain.vo.CostCarChargeVo; import org.dromara.property.domain.vo.CostItemsVo; -import org.dromara.property.mapper.CostCarChargeMapper; -import org.dromara.property.mapper.CostItemsMapper; -import org.dromara.property.mapper.CostPayFeeAuditMapper; -import org.dromara.property.mapper.CostReturnPayFeeMapper; +import org.dromara.property.mapper.*; import org.dromara.property.service.ICostCarChargeService; import org.dromara.system.api.RemoteUserService; import org.dromara.system.api.domain.vo.RemoteUserVo; @@ -55,6 +54,7 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { private final CostReturnPayFeeMapper costReturnPayFeeMapper; @DubboReference private RemoteUserService remoteUserService; + private final ResidentPersonMapper residentPersonMapper; /** @@ -79,11 +79,15 @@ public class CostCarChargeServiceImpl implements ICostCarChargeService { public TableDataInfo queryPageList(CostCarChargeBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - List residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList()); - List remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList); +// List residentPersonIdList = result.getRecords().stream().map(vo -> vo.getPersonId()).distinct().collect(Collectors.toList()); +// List remoteUserVos = remoteUserService.selectListByIds(residentPersonIdList); + List residentPeoplelist = residentPersonMapper.selectList(); result.getRecords().stream().forEach(s -> { - RemoteUserVo remoteUserVo = remoteUserVos.stream().filter(vo -> vo.getUserId() != null && vo.getUserId().equals(s.getPersonId())).findFirst().orElse(null); - s.setPersonName(Objects.nonNull(remoteUserVo) ? remoteUserVo.getNickName() : null); + if (CollUtil.isNotEmpty(residentPeoplelist)) { + ResidentPerson residentPerson = residentPeoplelist.stream() + .filter(vo -> vo.getId() != null && vo.getId().equals(s.getPersonId())).findFirst().orElse(null); + s.setPersonName(ObjectUtil.isNotEmpty(residentPerson)?residentPerson.getUserName():null); + } }); return TableDataInfo.build(result); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java index acadc285..76e391c5 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CostHouseChargeServiceImpl.java @@ -1,6 +1,7 @@ package org.dromara.property.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; @@ -16,6 +17,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.CostPayFeeAudit; import org.dromara.property.domain.CostReturnPayFee; +import org.dromara.property.domain.ResidentPerson; import org.dromara.property.domain.bo.CostChargeReturnFeeBo; import org.dromara.property.domain.enums.ChargeStatusEnum; import org.dromara.property.domain.vo.*; @@ -67,9 +69,9 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService { costHouseChargeDetailVo.setCostItemsVo(ObjectUtil.isNotEmpty(costItemsVo)?costItemsVo:null); TbRoomVo tbRoomVo = tbRoomMapper.selectVoById(costHouseChargeDetailVo.getRoomId()); costHouseChargeDetailVo.setRoomVo(ObjectUtil.isNotEmpty(tbRoomVo)?tbRoomVo:null); -// ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(costHouseChargeVo.getPersonId()); - RemoteUserVo userInfo = remoteUserService.getUserInfoById(costHouseChargeVo.getPersonId()); - costHouseChargeDetailVo.setPersonName(ObjectUtil.isNotEmpty(userInfo)?userInfo.getUserName():null); + ResidentPersonVo residentPersonVo = residentPersonMapper.selectVoById(costHouseChargeVo.getPersonId()); + //RemoteUserVo userInfo = remoteUserService.getUserInfoById(costHouseChargeVo.getPersonId()); + costHouseChargeDetailVo.setPersonName(ObjectUtil.isNotEmpty(residentPersonVo)?residentPersonVo.getUserName():null); return costHouseChargeDetailVo; } @@ -83,7 +85,15 @@ public class CostHouseChargeServiceImpl implements ICostHouseChargeService { @Override public TableDataInfo queryPageList(CostHouseChargeBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); + List residentPeoplelist = residentPersonMapper.selectList(); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().stream().forEach(s -> { + if (CollUtil.isNotEmpty(residentPeoplelist)) { + ResidentPerson residentPerson = residentPeoplelist.stream() + .filter(vo -> vo.getId() != null && vo.getId().equals(s.getPersonId())).findFirst().orElse(null); + s.setPersonName(ObjectUtil.isNotEmpty(residentPerson)?residentPerson.getUserName():null); + } + }); return TableDataInfo.build(result); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java index b8ff931e..56b18650 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/CustomerFeedbacksServiceImpl.java @@ -64,10 +64,10 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService { * @return 客户服务-意见反馈 */ @Override - public CustomerFeedbacksVo queryById(Long id){ + public CustomerFeedbacksVo queryById(Long id) { CustomerFeedbacksVo customerFeedbacksVo = baseMapper.selectVoById(id); ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypeMapper.selectById(customerFeedbacksVo.getFeedbackType()); - customerFeedbacksVo.setFeedbackTypeName(StringUtils.isNotBlank(serviceWorkOrdersType.getOrderTypeName())?serviceWorkOrdersType.getOrderTypeName():null); + customerFeedbacksVo.setFeedbackTypeName(StringUtils.isNotBlank(serviceWorkOrdersType.getOrderTypeName()) ? serviceWorkOrdersType.getOrderTypeName() : null); String nikName = remoteUserService.selectNicknameById(customerFeedbacksVo.getFeedbackPersion()); customerFeedbacksVo.setFeedbackPersionName(nikName); return customerFeedbacksVo; @@ -100,28 +100,29 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService { .collect(Collectors.toList()); List remoteUserVos = remoteUserService.selectListByIds(uerIds); result.getRecords().stream().forEach(s -> { - assembly(s,serviceWorkOrdersTypes,remoteUserVos); - }); + assembly(s, serviceWorkOrdersTypes, remoteUserVos); + }); } return TableDataInfo.build(result); } + /** * * @param customerFeedbacksVo 意见反馈返回信息 * */ - private void assembly(CustomerFeedbacksVo customerFeedbacksVo,List serviceWorkOrdersTypes,List remoteUserVos){ - - if(CollUtil.isNotEmpty(remoteUserVos)){ - RemoteUserVo remoteUserVo = remoteUserVos.stream() - .filter(vo -> vo.getUserId() != null && vo.getUserId().equals(customerFeedbacksVo.getFeedbackPersion())).findFirst().orElse(null); - customerFeedbacksVo.setFeedbackPersionName(StringUtils.isNotBlank(remoteUserVo.getNickName())?remoteUserVo.getNickName():null); - } + private void assembly(CustomerFeedbacksVo customerFeedbacksVo, List serviceWorkOrdersTypes, List remoteUserVos) { + if (CollUtil.isNotEmpty(remoteUserVos)) { + RemoteUserVo remoteUserVo = remoteUserVos.stream() + .filter(vo -> vo.getUserId() != null && vo.getUserId().equals(customerFeedbacksVo.getFeedbackPersion())).findFirst().orElse(null); + customerFeedbacksVo.setFeedbackPersionName(ObjectUtil.isNotNull(remoteUserVo) ? remoteUserVo.getNickName() : null); + } if (CollUtil.isNotEmpty(serviceWorkOrdersTypes)) { ServiceWorkOrdersType serviceWorkOrdersType = serviceWorkOrdersTypes.stream().filter(vo -> vo.getId() != null && vo.getId().equals(customerFeedbacksVo.getFeedbackType())).findFirst().orElse(null); - customerFeedbacksVo.setFeedbackTypeName(StringUtils.isNotBlank(serviceWorkOrdersType.getOrderTypeName())?serviceWorkOrdersType.getOrderTypeName():null); + customerFeedbacksVo.setFeedbackTypeName(ObjectUtil.isNotNull(serviceWorkOrdersType) ? serviceWorkOrdersType.getOrderTypeName() : null); } } + /** * 查询符合条件的客户服务-意见反馈列表 * @@ -179,22 +180,23 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService { @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(CustomerFeedbacksBo bo) { CustomerFeedbacks update = MapstructUtils.convert(bo, CustomerFeedbacks.class); - validEntityBeforeUpdate(update); + validEntityBeforeUpdate(update); return baseMapper.updateById(update) > 0; } /** * 保存前的数据校验 */ - private void validEntityBeforeSave(CustomerFeedbacks entity){ + private void validEntityBeforeSave(CustomerFeedbacks entity) { //TODO 做一些数据校验,如唯一约束 } + /** * 保存前的数据校验 */ - private void validEntityBeforeUpdate(CustomerFeedbacks entity){ + private void validEntityBeforeUpdate(CustomerFeedbacks entity) { //TODO 做一些数据校验,如唯一约束 - if(entity.getIsWorkOrder().equals("0")&& ObjectUtil.isEmpty(entity.getOrderId())){ + if (entity.getIsWorkOrder().equals("0") && ObjectUtil.isEmpty(entity.getOrderId())) { ServiceWorkOrders serviceWorkOrders = new ServiceWorkOrders(); serviceWorkOrders.setOrderName("意见反馈转工单"); LoginUser user = LoginHelper.getLoginUser(); @@ -226,7 +228,7 @@ public class CustomerFeedbacksServiceImpl implements ICustomerFeedbacksService { */ @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ + if (isValid) { //TODO 做一些业务上的校验,判断是否需要校验 } return baseMapper.deleteByIds(ids) > 0; diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java index a7501f6f..710dcd6b 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/InspectionPointServiceImpl.java @@ -12,8 +12,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.property.domain.InspectionPoint; import org.dromara.property.domain.bo.InspectionPointBo; +import org.dromara.property.domain.vo.InspectionItemVo; import org.dromara.property.domain.vo.InspectionPlanVo; import org.dromara.property.domain.vo.InspectionPointVo; +import org.dromara.property.mapper.InspectionItemMapper; import org.dromara.property.mapper.InspectionPlanMapper; import org.dromara.property.mapper.InspectionPointMapper; import org.dromara.property.service.IInspectionPointService; @@ -39,6 +41,7 @@ public class InspectionPointServiceImpl implements IInspectionPointService { private final InspectionPointMapper baseMapper; private final InspectionPlanMapper inspectionPlanMapper; + private final InspectionItemMapper inspectionItemMapper; /** * 查询巡检点 @@ -62,6 +65,8 @@ public class InspectionPointServiceImpl implements IInspectionPointService { public TableDataInfo queryPageList(InspectionPointBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + //收集巡检项目id + if (CollectionUtil.isEmpty(result.getRecords())) { return TableDataInfo.build(result); } @@ -69,8 +74,11 @@ public class InspectionPointServiceImpl implements IInspectionPointService { .map(vo -> vo.getItemId()) .distinct() .collect(Collectors.toList()); - List inspectionPlanVos = inspectionPlanMapper.selectVoByIds(itemIdList); - + List inspectionItemVos = inspectionItemMapper.selectVoByIds(itemIdList); + result.getRecords().stream().forEach(s->{ + InspectionItemVo inspectionItemVo = inspectionItemVos.stream().filter(vo -> vo.getId() != null && vo.getId().equals(s.getItemId())).findFirst().orElse(null); + s.setItemName(inspectionItemVo.getItemName()); + }); return TableDataInfo.build(result); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java index 6ab9c33e..663e4992 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/MeetBookingServiceImpl.java @@ -134,7 +134,7 @@ public class MeetBookingServiceImpl implements IMeetBookingService { if (CollUtil.isNotEmpty(residentUnitVolist)) { ResidentUnitVo residentUnitVo = residentUnitVolist.stream() .filter(vo -> vo.getId() != null && String.valueOf(vo.getId()).equals(s.getUnit())).findFirst().orElse(null); - s.setUnitName(residentUnitVo.getName()); + s.setUnitName(ObjectUtil.isNotEmpty(residentUnitVo) ?residentUnitVo.getName():null); } if (CollUtil.isNotEmpty(remoteUserVos)) { RemoteUserVo remoteUserVo = remoteUserVos.stream() diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java index 77d4175a..ae95608a 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java @@ -108,12 +108,6 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { */ @Override public TableDataInfo queryPageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) { - - //当前登录用户 - LoginUser loginUser = LoginHelper.getLoginUser(); - if (!LoginHelper.isSuperAdmin(loginUser.getUserId())) { - bo.setHandler(loginUser.getUserId()); - } LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); if (ObjectUtil.isEmpty(result.getRecords())) { @@ -550,5 +544,38 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService { }; } + /** + * 分页查询【工单处理】列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 【工单处理】分页列表 + */ + @Override + public TableDataInfo queryMobilePageList(ServiceWorkOrdersBo bo, PageQuery pageQuery) { + //当前登录用户 + LoginUser loginUser = LoginHelper.getLoginUser(); + if (!LoginHelper.isSuperAdmin(loginUser.getUserId())) { + bo.setHandler(loginUser.getUserId()); + } + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + if (ObjectUtil.isEmpty(result.getRecords())) { + return TableDataInfo.build(result); + } + List typeList = result.getRecords().stream().map(vo -> vo.getType()).distinct().collect(Collectors.toList()); + List serviceWorkOrdersTypeVoList = typesMapper.selectVoByIds(typeList); + if (ObjectUtil.isEmpty(serviceWorkOrdersTypeVoList)) { + return TableDataInfo.build(result); + } + List serviceWorkOrdersVoList = new ArrayList<>(); + result.getRecords().stream().forEach(s -> { + ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = serviceWorkOrdersTypeVoList.stream().filter(vo -> vo.getId() != null && vo.getId().equals(s.getType())).findFirst().orElse(null); + + s.setTypeName(ObjectUtil.isNotNull(serviceWorkOrdersTypeVo) ? serviceWorkOrdersTypeVo.getOrderTypeName() : null); + serviceWorkOrdersVoList.add(s); + }); + return TableDataInfo.build(new Page().setRecords(serviceWorkOrdersVoList).setTotal(result.getTotal())); + } }