湖北水库：项目进度排序

shenyijian

2024-09-11 2a29572ab5b4fcd6f49d258a6dedd8cf2394daed

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java

@@ -295,20 +295,25 @@
            list = sgProjectInfoMapper.progressList(page, searchDTO);
         }

      List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
      searchDTO.setProjectIds(ids);
      List<SgProjectInfoDO> projectProgress = new ArrayList<>();
      if(StringUtils.isNotBlank(searchDTO.getAdCode())){
         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
      }else {
         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
      }
//      List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
//      searchDTO.setProjectIds(ids);
//      List<SgProjectInfoDO> projectProgress = new ArrayList<>();
//      if(StringUtils.isNotBlank(searchDTO.getAdCode())){
//         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
//      }else {
//         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
//      }

      if (CollectionUtils.isNotEmpty(projectProgress)){
      Map<Long, String> progressMap = projectProgress.stream().filter(s->s!=null && s.getProjectProgress() !=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
//      if (CollectionUtils.isNotEmpty(projectProgress)){
      //Map<Long, String> progressMap = projectProgress.stream().filter(s->s!=null && s.getProjectProgress() !=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
      list.forEach(s->{
         s.setProjectProgress(progressMap.get(s.getId()));
      });}
         if (StringUtils.isNotBlank(s.getProjectProgress())){
            s.setProjectProgress(s.getProjectProgress()+"%");
         }else {
            s.setProjectProgress("0%");
         }
      });
//      }
      return page.setRecords(list);
   }