shenyijian
2024-09-18 7f3b30605ca7a30a0e5b5f4772e451a244db50f2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -348,8 +348,11 @@
    */
   private  void setDeptId(ProjectSearchDTO searchDTO) {
      String deptId = AuthUtil.getDeptId();
      boolean b = Objects.nonNull(searchDTO.getIsUnit()) && searchDTO.getIsUnit() == 1;
      if (!deptId.equals("420000000000")){
         searchDTO.setDeptId(deptId);
         if (!b){
            searchDTO.setDeptId(deptId);
         }
      }
   }
@@ -471,7 +474,7 @@
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
                  }else {
                     sgOperatingRateVO.setSeepageProgress("0");
                     sgOperatingRateVO.setSeepageProgress("0%");
                  }
               }
               //视频
@@ -484,7 +487,7 @@
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     sgOperatingRateVO.setVideoProgress(getBigDecimalPercent(divide));
                  }else {
                     sgOperatingRateVO.setVideoProgress("0");
                     sgOperatingRateVO.setVideoProgress("0%");
                  }
               }
               //渗压
@@ -497,7 +500,7 @@
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     sgOperatingRateVO.setTransProgress(getBigDecimalPercent(divide));
                  }else {
                     sgOperatingRateVO.setTransProgress("0");
                     sgOperatingRateVO.setTransProgress("0%");
                  }
               }
               //渗流
@@ -510,7 +513,7 @@
                     BigDecimal divide = BigDecimal.valueOf(deviceStart).divide(BigDecimal.valueOf(deviceCount), 2, BigDecimal.ROUND_UP);
                     sgOperatingRateVO.setSeepageProgress(getBigDecimalPercent(divide));
                  }else {
                     sgOperatingRateVO.setSeepageProgress("0");
                     sgOperatingRateVO.setSeepageProgress("0%");
                  }
               }
               }
@@ -536,7 +539,11 @@
            for (String id : ids) {
               projectSearchDTO.setProjectId(id);
               List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
               getProjectProgress(list).forEach(ss -> bigDecimals.add(ss.getProjectProgressNum()));
               getProjectProgress(list).forEach(ss->{
                  if (Objects.nonNull(ss.getProjectProgressNum())){
                     bigDecimals.add(ss.getProjectProgressNum());
                  }
               });
            }
            BigDecimal reduce = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);