shenyijian
2024-06-26 86eaace3ba215388c62dc23f0b108298e6f71e3f
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -139,7 +139,7 @@
      Map<Long, SgProjectInfoDO> progressMap = projectProgress.stream().collect(Collectors.toMap(SgProjectInfoDO::getId, Function.identity()));
      list.forEach(s->{
         SgProjectInfoDO sgProjectInfoDO = progressMap.get(s.getId());
         s.setProjectProgress(sgProjectInfoDO.getProjectProgress());
         s.setProgressName(sgProjectInfoDO.getProjectProgress());
         s.setProjectProgressNum(sgProjectInfoDO.getProjectProgressNum());
      });
      return list;
@@ -192,11 +192,12 @@
      List<SgProjectInfoVO> progressList = progressList(searchDTO);
      BigDecimal reduce = progressList.stream().map(SgProjectInfoDO::getProjectProgressNum).reduce(BigDecimal.ZERO, BigDecimal::add);
      BigDecimal divide = reduce.divide(BigDecimal.valueOf(progressList.size()), 2, RoundingMode.HALF_UP);
      map.put("all",  list.size());
      map.put("pending", pending.size());
      map.put("progress",  progress.size());
      map.put("over",  over.size());
      map.put("projectProgress",  getBigDecimalPercent(reduce));
      map.put("projectProgress",  getBigDecimalPercent(divide));
      return map;
   }