diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java index 77dd74f719..d51825c27b 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java @@ -48,6 +48,11 @@ public class ProjectCategoryResultDTO implements Serializable { */ private Integer closedProjectTotal; + /** + * 所有项目总数 + */ + private Integer allProjectTotal; + /** * 总数占比 */ @@ -70,5 +75,6 @@ public class ProjectCategoryResultDTO implements Serializable { this.totalRatio = "0.00%"; this.closedRatio = "0.00%"; this.children = new ArrayList<>(); + this.allProjectTotal = NumConstant.ZERO; } } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index a8ed528963..19861641df 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -284,6 +284,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { endCategoryList.forEach(e -> { e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal)); e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal())); + e.setAllProjectTotal(finalTotal); }); }else { Integer endTotal = screenProjectOrgDailyDao.selectProjectTotalByAgency(customerId, endTime, orgId); @@ -302,6 +303,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { endCategoryList.forEach(e -> { e.setTotalRatio(ratio(e.getProjectTotal(), finalTotal)); e.setClosedRatio(ratio(e.getClosedProjectTotal(),e.getProjectTotal())); + e.setAllProjectTotal(finalTotal); }); } List finalEndCategoryList = endCategoryList;