From 7250f246926be2c418ac89e002bf8aa396a94efa Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 20 Jan 2022 14:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=8C=97=E9=A1=B9=E7=9B=AE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../govproject/impl/GovProjectServiceImpl.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
index 087a4e9b17..5077b0af84 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
@@ -557,11 +557,11 @@ public class GovProjectServiceImpl implements GovProjectService {
 		List<ResiEventDTO> eventUser = projectDao.getEventList(projectIds);
 		List<ProjectRelatedPersonnelDTO> topicUser = projectDao.getTopicUser(projectIds);
 
-		//5.封装数据
+		//6.封装数据
 		//组织或网格id->组织或网格名称
 		Map<String, String> map = new HashMap<>();
 		result.getList().forEach(re -> {
-			//所属组织
+			//所属组织【议题来源网格】
 			if ("issue".equals(re.getOrigin())) {
 				if (map.containsKey(re.getGridId())) {
 					re.setOrgName(map.get(re.getGridId()));
@@ -572,6 +572,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 						map.put(re.getGridId(), gridInfo.getGridName());
 					}
 				}
+				//立项来源组织
 			} else if ("agency".equals(re.getOrigin())) {
 				if (map.containsKey(re.getAgencyId())) {
 					re.setOrgName(map.get(re.getAgencyId()));
@@ -583,6 +584,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 					}
 
 				}
+				//事件区分上报给网格或组织
 			} else if ("resi_event".equals(re.getOrigin())) {
 				if (eventMap.containsKey(re.getOriginId())) {
 					if ("grid".equals(eventMap.get(re.getOriginId()).getOrgType())) {
@@ -613,13 +615,15 @@ public class GovProjectServiceImpl implements GovProjectService {
 			List<String> caId = new ArrayList<>();
 			list.forEach(ca -> {
 				if (ca.getProjectId().equals(re.getProjectId())) {
-					caId.add(ca.getCategoryPids());
+					//caId.add(ca.getCategoryPids());
+					caId.add(ca.getCategoryCode());
 				}
 			});
 			//一级分类名称、code集合
 			List<String> caName = new ArrayList<>();
 			List<String> caCode = new ArrayList<>();
-			categoryList.forEach(ca -> caId.stream().filter(li -> ca.getId().equals(li)).forEach(s -> {
+			//categoryList.forEach(ca -> caId.stream().filter(li -> ca.getId().equals(li)).forEach(s -> {
+			categoryList.forEach(ca -> caId.stream().filter(li -> ca.getCategoryCode().equals(li)).forEach(s -> {
 				caName.add(ca.getCategoryName());
 				caCode.add(ca.getCategoryCode());
 			}));