From 66e8f0b269aec787e613683a50a5839f03bb9033 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 2 Mar 2021 13:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=BB=E7=90=86=E8=83=BD=E5=8A=9B=E6=A6=9C?=
 =?UTF-8?q?=E5=8D=95=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenGovernRankDataDao.xml | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

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 f98257b0a0..35130ae0b1 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
@@ -27,7 +27,7 @@
 
     <!--  基层治理-治理能力榜单 多客户版，调用此sql -->
     <select id="selectGovernCapacityRatioNew" resultType="com.epmet.evaluationindex.screen.dto.result.GovernCapacityResultDTO">
-        SELECT
+        (SELECT
         rankData.ORG_NAME AS agencyName,
         rankData.RESPONSE_RATIO,
         rankData.RESOLVED_RATIO,
@@ -47,7 +47,31 @@
         AND rankData.MONTH_ID =#{monthId}
         ORDER BY
         (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
+         rankData.RESPONSE_RATIO DESC,rankData.RESOLVED_RATIO DESC,rankData.GOVERN_RATIO DESC,rankData.SATISFACTION_RATIO DESC)
+        union
+        (SELECT
+        rankData.ORG_NAME AS agencyName,
+        rankData.RESPONSE_RATIO,
+        rankData.RESOLVED_RATIO,
+        rankData.GOVERN_RATIO,
+        rankData.SATISFACTION_RATIO,
+        ca.agency_name AS parentAgencyName
+        FROM
+        screen_govern_rank_data rankData
+        inner JOIN screen_customer_grid grid ON (rankData.org_id = grid.grid_id AND grid.DEL_FLAG = 0)
+        left join screen_customer_agency ca on (ca.agency_id = grid.parent_agency_id)
+        WHERE
+        rankData.DEL_FLAG = '0'
+        AND rankData.org_id in
+        <foreach collection="orgIds" item="orgId" open="(" close=")" separator=",">
+            #{orgId}
+        </foreach>
+        AND rankData.MONTH_ID =#{monthId}
+        ORDER BY
+        (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