项目查询进度添加区域筛选和白蚁项目管理优化

yxm

2024-07-17 a1e7b27114eaf0bfd4d9768b76ba0db10e4d87bf

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

@@ -162,7 +162,13 @@
   @Override
   public List<SgProjectInfoVO> progressList(ProjectSearchDTO searchDTO) {
      List<SgProjectInfoVO> list = new ArrayList<>();
      List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
      List<SgProjectInfoDO> projectProgress = new ArrayList<>();
      if(!searchDTO.getAdCode().isEmpty()){
         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
      }else {
          projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
      }

      if (CollectionUtils.isNotEmpty(projectProgress)){
      projectProgress.forEach(s->{
         SgProjectInfoVO sgProjectInfoVO = new SgProjectInfoVO();
@@ -185,10 +191,22 @@
    */
   @Override
   public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
      List<SgProjectInfoVO> list = sgProjectInfoMapper.progressList(page, searchDTO);
      List<SgProjectInfoVO> list = new ArrayList<>();
         if(!searchDTO.getAdCode().isEmpty()){
            list =   sgProjectInfoMapper.progressList1(page, searchDTO);
         }else {
            list = sgProjectInfoMapper.progressList(page, searchDTO);
         }

      List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
      searchDTO.setProjectIds(ids);
      List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
      List<SgProjectInfoDO> projectProgress = new ArrayList<>();
      if(!searchDTO.getAdCode().isEmpty()){
         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));
      list.forEach(s->{