湖北水库项目
blame | history | patch | commit | commitdiff | ignore whitespace
shenyijian
2024-09-05 42968703ee1ce4e34991bc0f1e189d2245cbd600 
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java


@@ -289,7 +289,7 @@


   @Override


   public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {


      List<SgProjectInfoVO> list = new ArrayList<>();


         if(!searchDTO.getAdCode().isEmpty()){


         if(StringUtils.isNotBlank(searchDTO.getAdCode())){


            list =   sgProjectInfoMapper.progressList1(page, searchDTO);


         }else {


            list = sgProjectInfoMapper.progressList(page, searchDTO);


@@ -298,7 +298,7 @@


      List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());


      searchDTO.setProjectIds(ids);


      List<SgProjectInfoDO> projectProgress = new ArrayList<>();


      if(!searchDTO.getAdCode().isEmpty()){


      if(StringUtils.isNotBlank(searchDTO.getAdCode())){


         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));


      }else {


         projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));


@@ -560,7 +560,7 @@


      Map<String, Object> map  = new HashMap<>();


      List<SgProjectInfoVO> progressList = progressList(searchDTO);


      BigDecimal reduce = progressList.stream().filter(s->s.getProjectProgressNum()!=null).map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);


      BigDecimal divide = reduce.divide(BigDecimal.valueOf(progressList.size()), 2, RoundingMode.HALF_UP);


      BigDecimal divide = reduce.divide(BigDecimal.valueOf(progressList.size()==0?1:progressList.size()), 2, RoundingMode.HALF_UP);


      List<SgProjectInfoDO> pending = progressList.stream().filter(s -> s.getStatus() == 0).collect(Collectors.toList());


      List<SgProjectInfoDO> progress = progressList.stream().filter(s -> s.getStatus() == 1).collect(Collectors.toList());


      List<SgProjectInfoDO> over = progressList.stream().filter(s -> s.getStatus() == 2).collect(Collectors.toList());