liulin
6 天以前 2b5c36b4830adf4227f248d4e10bdb90b1e5f3d8
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
@@ -193,7 +197,22 @@
        }
        return ExecutedResult.success(result);
    }
    public ExecutedResult<List<UserWorkOrderVO>> getUserWorkList(){
        List<UserWorkOrderVO> result = new ArrayList<>();
        List<UserWorkOrderPO> list = mapper.getList();
        if(ListUtil.isNotNullOrEmpty(list)){
            result=CopierUtil.mapTo(list,UserWorkOrderVO.class);
            List<WaterFacilityPO> facilityPOList = waterFacilityMapper.getList();
            for(UserWorkOrderVO vo:result){
                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());
                }
            }
        }
        return ExecutedResult.success(result);
    }
    public ExecutedResult<PagerResult<UserWorkOrderVO>> search(SearchUserWorkOrder search) {
        // 处理创建时间范围-查询参数
        Tuple<String, String> createTimeRange = ParameterUtil.getTimeRange(search.getCreateTimeRange());
@@ -210,7 +229,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());