Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -312,10 +312,12 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
                 r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio());
                 r.setProjectTotal(e.getProjectTotal());
                 r.setClosedProjectTotal(e.getClosedProjectTotal());
+                r.setAllProjectTotal(e.getAllProjectTotal());
             });
             r.getChildren().forEach(son -> finalEndCategoryList.stream().filter(e -> son.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
                 son.setTotalRatio(e.getTotalRatio());son.setClosedRatio(e.getClosedRatio());
                 son.setProjectTotal(e.getProjectTotal());son.setClosedProjectTotal(e.getClosedProjectTotal());
+                son.setAllProjectTotal(e.getAllProjectTotal());
             }));
         });
         // 排序