From e975ac29eebe49bb1375344e57d41d630ba73ff8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 8 Nov 2021 14:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluationindex/screen/impl/ScreenProjectServiceImpl.java  | 3 +++
 1 file changed, 3 insertions(+)

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 3a3fe87591..a8ed528963 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
@@ -308,9 +308,12 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         result.forEach(r -> {
             finalEndCategoryList.stream().filter(e -> r.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
                 r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio());
+                r.setProjectTotal(e.getProjectTotal());
+                r.setClosedProjectTotal(e.getClosedProjectTotal());
             });
             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());
             }));
         });
         // 排序