From 533e51254d75a0f3941dd1479ae7ccb363ab255c Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 14 Apr 2021 15:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB=20org=20?=
 =?UTF-8?q?=E5=8D=95=E5=AE=A2=E6=88=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...eenProjectCategoryOrgDailyServiceImpl.java | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
index f61487abe0..e3ebbf82e4 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryOrgDailyServiceImpl.java
@@ -260,33 +260,37 @@ public class ScreenProjectCategoryOrgDailyServiceImpl extends BaseServiceImpl<Sc
             result = ConvertUtils.sourceToTarget(categoryProjectResultDTOS,ScreenProjectCategoryOrgDailyEntity.class);
         }
         // 组织项目分类 项目数
-        List<String> orgIds = agencyIdList.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
-        List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId);
-        if (!CollectionUtils.isEmpty(result)){
-            if (!CollectionUtils.isEmpty(screenProjectCategory)){
-                result.forEach(r -> {
-                    screenProjectCategory.forEach(pc -> {
-                        if (r.getOrgId().equals(pc.getOrgId()) && r.getCategoryCode().equals(pc.getCategoryCode())){
-                            pc.setStatus(true);
-                            r.setProjectTotal(r.getProjectTotal() + pc.getProjectTotal());
-                        }
+        Map<String, List<CustomerAgencyInfoResultDTO>> groupByLevel = agencyIdList.stream().collect(Collectors.groupingBy(CustomerAgencyInfoResultDTO::getLevel));
+        List<CustomerAgencyInfoResultDTO> levelAgencyInfo = groupByLevel.get(level);
+        if (!CollectionUtils.isEmpty(levelAgencyInfo)){
+            List<String> orgIds = levelAgencyInfo.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
+            List<ScreenProjectCategoryGridDailyDTO> screenProjectCategory = factOriginProjectCategoryDailyService.selectListProjectCategoryByOrg(orgIds,customerId);
+            if (!CollectionUtils.isEmpty(result)){
+                if (!CollectionUtils.isEmpty(screenProjectCategory)){
+                    result.forEach(r -> {
+                        screenProjectCategory.forEach(pc -> {
+                            if (r.getOrgId().equals(pc.getOrgId()) && r.getCategoryCode().equals(pc.getCategoryCode())){
+                                pc.setStatus(true);
+                                r.setProjectTotal(r.getProjectTotal() + pc.getProjectTotal());
+                            }
+                        });
                     });
-                });
-                Map<Boolean, List<ScreenProjectCategoryGridDailyDTO>> groupByStatus = screenProjectCategory.stream().collect(Collectors.groupingBy(ScreenProjectCategoryGridDailyDTO::getStatus));
-                List<ScreenProjectCategoryGridDailyDTO> screenProjectCategoryNoCal = groupByStatus.get(false);
-                if (!CollectionUtils.isEmpty(screenProjectCategoryNoCal)){
-                    List<ScreenProjectCategoryOrgDailyEntity> noCalCategory = ConvertUtils.sourceToTarget(screenProjectCategoryNoCal, ScreenProjectCategoryOrgDailyEntity.class);
-                    result.addAll(noCalCategory);
+                    Map<Boolean, List<ScreenProjectCategoryGridDailyDTO>> groupByStatus = screenProjectCategory.stream().collect(Collectors.groupingBy(ScreenProjectCategoryGridDailyDTO::getStatus));
+                    List<ScreenProjectCategoryGridDailyDTO> screenProjectCategoryNoCal = groupByStatus.get(false);
+                    if (!CollectionUtils.isEmpty(screenProjectCategoryNoCal)){
+                        List<ScreenProjectCategoryOrgDailyEntity> noCalCategory = ConvertUtils.sourceToTarget(screenProjectCategoryNoCal, ScreenProjectCategoryOrgDailyEntity.class);
+                        result.addAll(noCalCategory);
+                    }
+                }
+            }else {
+                if (!CollectionUtils.isEmpty(screenProjectCategory)){
+                    result = ConvertUtils.sourceToTarget(screenProjectCategory, ScreenProjectCategoryOrgDailyEntity.class);
                 }
             }
-        }else {
-            if (!CollectionUtils.isEmpty(screenProjectCategory)){
-                result = ConvertUtils.sourceToTarget(screenProjectCategory, ScreenProjectCategoryOrgDailyEntity.class);
+            if (!CollectionUtils.isEmpty(result)){
+                result.forEach(r -> {r.setOrgType(level);r.setDateId(dateId);});
             }
         }
-        if (!CollectionUtils.isEmpty(result)){
-            result.forEach(r -> {r.setOrgType(level);r.setDateId(dateId);});
-        }
         deleteAndInsert(customerId,dateId,result);
     }