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

yxm

2024-07-17 a1e7b27114eaf0bfd4d9768b76ba0db10e4d87bf

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

@@ -71,8 +71,17 @@
    */
   @Override
   public List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO) {
      List<PreAcceVO>  palist = new ArrayList<>();
      List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject( searchDTO);
      return getProjectProgress(list);
      palist.add(handleQuery(25, list.get(0).getId()));
      palist.add(handleQuery(26, list.get(0).getId()));
      List<SgProjectInfoDO> projectProgress = getProjectProgress(list);
      projectProgress.forEach(s->{
         s.setPreAcce(palist);
      });


      return projectProgress;
   }

   /**
@@ -136,11 +145,6 @@
            typeVO.setTypeProgress(getBigDecimalPercent(divideDevice));
            sgGxDOS.add(typeVO);
         }

            List<PreAcceVO>  palist = new ArrayList<>();
         palist.add(handleQuery(12, 25, list.get(0).getId()));
         palist.add(handleQuery(13, 26,list.get(0).getId()));
         sgProjectInfoDO.setPreAcce(palist);
         BigDecimal allDeviceSize = BigDecimal.valueOf(allDevice.size());
         if (!allDeviceSize.equals(BigDecimal.ZERO)){
            double sum = allDevice.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum();
@@ -158,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();
@@ -181,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->{
@@ -357,9 +379,9 @@
   }

   // 处理查询和添加到列表的方法
   private  PreAcceVO handleQuery(int gxStepId, int stepIdForNull, Long programId) {
   private  PreAcceVO handleQuery( int stepIdForNull, Long programId) {
      QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
      queryWrapper.eq("gx_step_id", gxStepId)
      queryWrapper.eq("gx_step_id", stepIdForNull)
         .eq("profram_id", programId);
      SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper);

@@ -368,8 +390,16 @@
         preAcceVO.setId(sgProgressReportDO.getId().toString());
         preAcceVO.setName(sgProgressReportDO.getGxStepName());
         preAcceVO.setStatus((long) sgProgressReportDO.getStatus());
         preAcceVO.setProgramId(programId);
         preAcceVO.setGxDeviceId(sgProgressReportDO.getGxDeviceId());
         preAcceVO.setGxStepId(sgProgressReportDO.getGxStepId());
      } else {
         preAcceVO.setName(sgGxStepMapper.selectById(stepIdForNull).getGxStepName());
         SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(stepIdForNull);
         preAcceVO.setName(sgGxStepDO.getGxStepName());
         preAcceVO.setProgramId(programId);
         preAcceVO.setGxDeviceId(stepIdForNull != 25? (long)998:(long)999);
         preAcceVO.setGxStepId(sgGxStepDO.getId());

      }
      return  preAcceVO;