项目分类分析添加 话题Id up2

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -572,11 +572,18 @@ public class GovProjectServiceImpl implements GovProjectService {
 		List<ResiEventDTO> eventUser = projectDao.getEventList(projectIds);
 		List<ProjectRelatedPersonnelDTO> topicUser = projectDao.getTopicUser(projectIds);
 
+		//市北客户查询 下议题区分下来源 设置topicId
+		Map<String, String> issueTopicSourceMap = new HashMap<>();
+		if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(loginUserUtil.getLoginUserCustomerId())){
+			issueTopicSourceMap = govIssueService.selectIssueTopicIdType(result.getList().stream()
+					.filter(re -> "issue".equals(re.getOrigin()))
+					.map(CategoryProjectResultDTO.Project::getOriginId)
+					.collect(Collectors.toList())).stream().collect(Collectors.toMap(IssueInfoDTO::getIssueId,IssueInfoDTO::getTopicId));
+		}
 		//6.封装数据
 		//组织或网格id->组织或网格名称
 		Map<String, String> map = new HashMap<>();
-		result.getList().forEach(re -> {
-			//所属组织【议题来源网格】
+		for (CategoryProjectResultDTO.Project re : result.getList()) {//所属组织【议题来源网格】
 			if ("issue".equals(re.getOrigin())) {
 				if (map.containsKey(re.getGridId())) {
 					re.setOrgName(map.get(re.getGridId()));
@@ -587,6 +594,8 @@ public class GovProjectServiceImpl implements GovProjectService {
 						map.put(re.getGridId(), gridInfo.getGridName());
 					}
 				}
+				//市北议题来源的设置话题Id
+				re.setTopicId(issueTopicSourceMap.get(re.getOriginId()));
 				//立项来源组织
 			} else if ("agency".equals(re.getOrigin())) {
 				if (map.containsKey(re.getAgencyId())) {
@@ -655,7 +664,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 					re.setUserId(to.getUserId());
 				}
 			});
-		});
+		}
 
 		resultDTO.setList(result.getList());
 		return resultDTO;