From e5cb9b2dca00a3d88c4dccf813a7e6946f9a1dc9 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 11 Jan 2021 16:54:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=B2=BB=E7=90=86=E8=83=BD?=
 =?UTF-8?q?=E5=8A=9B=E6=A6=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=B8=8A=E7=BA=A7?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/GovernCapacityRankResultDTO.java   |  5 ++++
 .../dto/result/GovernCapacityResultDTO.java   |  5 ++++
 .../mapper/screen/ScreenGovernRankDataDao.xml | 24 +++++++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
index 0f6b481e1c..bf6ae28829 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityRankResultDTO.java
@@ -39,4 +39,9 @@ public class GovernCapacityRankResultDTO implements Serializable {
      * 满意率
      * */
     private String satisfactionRatio;
+
+    /**
+     * 当前agencyName的上一级组织名称
+     */
+    private String parentAgencyName;
 }
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
index f51fe26255..95ab00a382 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/GovernCapacityResultDTO.java
@@ -39,4 +39,9 @@ public class GovernCapacityResultDTO implements Serializable {
      * 满意率
      * */
     private BigDecimal satisfactionRatio;
+
+    /**
+     * 当前agencyName的上一级组织名称
+     */
+    private String parentAgencyName;
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
index 7976de7ff1..a1766981cc 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenGovernRankDataDao.xml
@@ -6,19 +6,23 @@
     <!-- 查询政府治理能力各项指标 -->
     <select id="selectGovernCapacityRatio" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
        SELECT
-            ORG_NAME AS agencyName,
-            RESPONSE_RATIO,
-            RESOLVED_RATIO,
-            GOVERN_RATIO,
-            SATISFACTION_RATIO
+            rankData.ORG_NAME AS agencyName,
+            rankData.RESPONSE_RATIO,
+            rankData.RESOLVED_RATIO,
+            rankData.GOVERN_RATIO,
+            rankData.SATISFACTION_RATIO,
+            agency.AGENCY_NAME AS parentAgencyName
         FROM
-            screen_govern_rank_data
+            screen_govern_rank_data rankData
+        LEFT JOIN
+            screen_customer_agency agency
+            ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = '0' AND agency.AGENCY_ID = #{agencyId}
         WHERE
-            DEL_FLAG = '0'
-            AND PARENT_ID = #{agencyId}
-            AND MONTH_ID = #{monthId}
+            rankData.DEL_FLAG = '0'
+            AND rankData.PARENT_ID = #{agencyId}
+            AND rankData.MONTH_ID = #{monthId}
         ORDER BY
-            (RESPONSE_RATIO + RESOLVED_RATIO + GOVERN_RATIO + SATISFACTION_RATIO) DESC,RESPONSE_RATIO DESC,RESOLVED_RATIO DESC,GOVERN_RATIO DESC,SATISFACTION_RATIO DESC
+            (rankData.RESPONSE_RATIO + rankData.RESOLVED_RATIO + rankData.GOVERN_RATIO + rankData.SATISFACTION_RATIO) DESC,rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC
     </select>
 
 </mapper>
\ No newline at end of file