From 49c461ecee96546dadf331d409a62910bf4fa888 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 09:58:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8B=E7=BA=A7=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E6=8C=87=E6=A0=87=E5=88=86=E6=95=B0=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/GovProjectServiceImpl.java           |  4 +-
 .../screen/ScreenIndexDataMonthlyDao.xml      | 44 ++++++++++++-------
 2 files changed, 31 insertions(+), 17 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 abc34e5c5c..d48c31f2d7 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
@@ -116,10 +116,10 @@ public class GovProjectServiceImpl implements GovProjectService {
 		List<ProjectDistributionResultDTO> resultDTOList = new ArrayList<>();
 		List<IssueInfoDTO> issueInfoDTOList = govIssueService.selectShiftProjectIssueList(formDTO.getCustomerId(), formDTO.getGridId(),formDTO.getPageNo(),formDTO.getPageSize());
 		if (CollectionUtils.isNotEmpty(issueInfoDTOList)) {
-			List<String> topicIds = issueInfoDTOList.stream().map(data -> data.getTopicId()).collect(Collectors.toList());
+			List<String> topicIds = issueInfoDTOList.stream().map(IssueInfoDTO::getTopicId).collect(Collectors.toList());
 			// log.info("话题id集合:" + JSON.toJSONString(topicIds, true));
 			List<ResiTopicDTO> topicInfoDTOList = resiGroupService.selectTopicInfoByIds(topicIds);
-			List<String> issueIds = issueInfoDTOList.stream().map(data -> data.getIssueId()).collect(Collectors.toList());
+			List<String> issueIds = issueInfoDTOList.stream().map(IssueInfoDTO::getIssueId).collect(Collectors.toList());
 			// log.info("议题id集合:" + JSON.toJSONString(issueIds, true));
 			resultDTOList = projectDao.selectList(formDTO.getCustomerId(),issueIds);
 			for (ProjectDistributionResultDTO project : resultDTOList) {
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 1dcde880e4..3440e5ab5c 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -230,46 +230,60 @@
 
     <select id="getSingleIndexRank" resultType="com.epmet.evaluationindex.screen.dto.result.PeerComparisonResultDTO">
         SELECT
-            ORG_ID,
-            ORG_NAME,
+            score.ORG_ID,
+            score.ORG_NAME,
         <choose>
             <when test="indexCode == 'dangjiannengli'">
-                round(party_dev_ablity,1) as score
+                round(score.party_dev_ablity,1) as score
             </when>
             <when test="indexCode == 'zhilinengli'">
-                round(govern_ablity,1) as score
+                round(score.govern_ablity,1) as score
             </when>
             <when test="indexCode == 'fuwunengli'">
-                round(service_ablity,1) as score
+                round(score.service_ablity,1) as score
             </when>
         </choose>
         FROM
-        screen_index_data_monthly
+        screen_index_data_monthly score
+        <if test="orgType != null and orgType != ''">
+            <choose>
+                <when test="orgType == 'grid'">
+                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                <when test="orgType == 'agency'">
+                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+                  <when test="orgType == 'department'">
+                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                </when>
+            </choose>
+        </if>
+
         WHERE
-        del_flag = '0'
+        score.del_flag = '0'
         <if test="customerId != null and customerId != ''">
-            AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+            AND score.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
         </if>
-        AND PARENT_ID = #{agencyId,jdbcType=VARCHAR}
-        AND MONTH_ID = #{monthId,jdbcType=VARCHAR}
+        AND score.PARENT_ID = #{agencyId,jdbcType=VARCHAR}
+        AND score.MONTH_ID = #{monthId,jdbcType=VARCHAR}
         <choose>
             <when test="orgType != null and orgType != ''">
-                AND ORG_TYPE = #{orgType,jdbcType=VARCHAR}
+                AND score.ORG_TYPE = #{orgType,jdbcType=VARCHAR}
             </when>
             <otherwise>
-                AND ORG_TYPE != 'department'
+                AND score.ORG_TYPE != 'department'
             </otherwise>
         </choose>
         ORDER BY
         <choose>
             <when test="indexCode == 'dangjiannengli'">
-                party_dev_ablity
+                score.party_dev_ablity
             </when>
             <when test="indexCode == 'zhilinengli'">
-                govern_ablity
+                score.govern_ablity
             </when>
             <when test="indexCode == 'fuwunengli'">
-               service_ablity
+               score.service_ablity
             </when>
         </choose>
         ${sort}