From f6aff9a2ac98e72faed6065edeada3f10a5215d7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 14 Oct 2021 12:47:58 +0800
Subject: [PATCH] =?UTF-8?q?screen=5Fproject=5Fdata=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?id=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/Issue/impl/IssueServiceImpl.java   | 9 +++++++--
 .../toscreen/impl/ScreenProjectSettleServiceImpl.java    | 6 +++++-
 .../src/main/resources/mapper/ProjectCategoryDao.xml     | 4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java
index fd5702c71b..593c21b9fa 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/Issue/impl/IssueServiceImpl.java
@@ -12,6 +12,7 @@ import com.epmet.dto.extract.result.SatisfactionInfoResultDTO;
 import com.epmet.dto.issue.*;
 import com.epmet.entity.issue.IssueEntity;
 import com.epmet.service.Issue.IssueService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -26,6 +27,7 @@ import java.util.Set;
  * @dscription
  * @date 2020/6/17 16:02
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.GOV_ISSUE)
 public class IssueServiceImpl implements IssueService {
@@ -162,8 +164,11 @@ public class IssueServiceImpl implements IssueService {
 			List<IssueProjectCategoryDictDTO> categories = statsIssueDao.selectCategory(customerId, categoryIds);
 			if(!CollectionUtils.isEmpty(categories)){
 				StringBuilder str = new StringBuilder();
-				categories.forEach(category -> {str.append(category.getCategoryName()).append(StrConstant.COMMA);});
-				map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.TWO));
+				categories.forEach(category -> {
+					str.append(category.getCategoryName()).append(StrConstant.COMMA);
+					//log.info(str.toString());
+				});
+				map.put(projectId,str.substring(NumConstant.ZERO,str.length() - NumConstant.ONE));
 			}
 		});
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
index dd9eafe5dd..8a41163726 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java
@@ -127,6 +127,8 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 		if(!CollectionUtils.isEmpty(orientData)) {
 			projectIds.addAll(orientData.stream().map(ScreenProjectDataDTO::getProjectId).distinct().collect(Collectors.toList()));
 		}
+		projectIds.clear();
+		projectIds.add("18759f2fb5c5fb8513c4a21b0be81834");
 		Map<String, Set<String>> categoryMap = projectService.getProjectCategory(projectIds);
 		if(!CollectionUtils.isEmpty(categoryMap)){
 			Map<String, String> integratedProjectCategoryMap = issueService.getIntegratedProjectCategory(categoryMap, param.getCustomerId());
@@ -139,7 +141,9 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic
 				});
 			}
 		}
-
+		if(projectIds.contains("4f670b349899b33c20e888e77842d938")){
+			return;
+		}
 		//重新计算orientData的级别 有现成的方法 fact_origin_project_org_period_daily
 //		originMainService.computerIfExceed(orientData, exceedLimit,about2ExceedLimit);
 		//todo 与上面重复处理 暂时注释掉
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
index 3f9c27f6d2..49942cdca3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectCategoryDao.xml
@@ -5,7 +5,7 @@
 
     <select id="selectProjectCategoryIdList" resultType="java.lang.String">
         SELECT
-            category_id
+            distinct category_id
         FROM
             project_category
         WHERE
@@ -38,8 +38,8 @@
     <!-- 根据项目ID查询项目分类 -->
     <select id="selectCategoryByIds" resultType="com.epmet.dto.result.ProjectCategoryDisPoseResultDTO">
         SELECT
+            distinct CATEGORY_CODE,
             PROJECT_ID,
-            CATEGORY_CODE,
             CUSTOMER_ID
         FROM project_category
         WHERE DEL_FLAG = '0'