From 49aaecfb0617b0e6043147c86f3d303e9f24867e Mon Sep 17 00:00:00 2001 From: liulin <lin.liu@88.com> Date: 星期三, 09 七月 2025 20:27:56 +0800 Subject: [PATCH] 修改yml配置 --- src/main/java/com/fengdu/gas/service/UserWorkOrderService.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/fengdu/gas/service/UserWorkOrderService.java b/src/main/java/com/fengdu/gas/service/UserWorkOrderService.java index e9fffe6..64e7691 100644 --- a/src/main/java/com/fengdu/gas/service/UserWorkOrderService.java +++ b/src/main/java/com/fengdu/gas/service/UserWorkOrderService.java @@ -26,6 +26,8 @@ import com.fengdu.gas.common.enums.*; import com.fengdu.gas.common.model.Tuple; import com.fengdu.gas.common.util.*; +import com.fengdu.gas.repository.impl.WaterFacilityMapperImpl; +import com.fengdu.gas.repository.po.WaterFacilityPO; import org.apache.commons.lang3.BooleanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -47,6 +49,8 @@ public class UserWorkOrderService extends BaseService { @Autowired private UserWorkOrderMapperImpl mapper; + @Autowired + private WaterFacilityMapperImpl waterFacilityMapper; public ExecutedResult<Long> create(ReqCreateUserWorkOrder request) { // 转换po @@ -210,7 +214,15 @@ if (ListUtil.isNotNullOrEmpty(list)) { pageList.setLastId(list.get(list.size() - 1).getId()); // 转换vo - listVo = UserWorkOrderConvert.INSTANCE.toVo(list); + listVo = CopierUtil.mapTo(list, UserWorkOrderVO.class); + List<WaterFacilityPO> facilityPOList = waterFacilityMapper.getList(); + for(UserWorkOrderVO vo:listVo){ + WaterFacilityPO waterFacilityPO = facilityPOList.stream().filter(item -> item.getFacilityCode().equals(vo.getFacilityCode())).findFirst().orElse(null); + if(Objects.nonNull(waterFacilityPO)){ + vo.setPointName(waterFacilityPO.getPointName()); + vo.setFacilityName(waterFacilityPO.getFacilityName()); + } + } } PagerResult<UserWorkOrderVO> result = new PagerResult<>(pageList.getLimit(), pageList.getPage(), pageList.getTotal(), listVo); result.setLastId(pageList.getLastId()); -- Gitblit v1.9.3