From 8668d94b7658c648250ae9f55d4b5b3075edfa36 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 10:46:49 +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

---
 .../screen/ScreenIndexDataMonthlyDao.xml      | 52 +++++++++++--------
 .../screen/ScreenIndexDataYearlyDao.xml       | 46 +++++++++-------
 2 files changed, 57 insertions(+), 41 deletions(-)

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 ba7056c909..ea9a06365e 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
@@ -72,38 +72,46 @@
     <select id="selectSubAgencyOrGridIndexMonthlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
-        org_name AS `NAME`,
-        service_ablity * SERVICE_ABLITY_WEIGHT AS serviceAbility,
-        party_dev_ablity * PARTY_DEV_WEIGHT AS partyDevAbility,
-        govern_ablity * GOVERN_ABLITY_WEIGHT AS governAbility,
-        PARTY_DEV_WEIGHT AS partyWeight,
-        GOVERN_ABLITY_WEIGHT AS governWeight,
-        SERVICE_ABLITY_WEIGHT AS serviceWeight,
-        ORG_ID orgId,
-        ORG_TYPE orgType
+        score.org_name AS `NAME`,
+        score.service_ablity * score.SERVICE_ABLITY_WEIGHT AS serviceAbility,
+        score.party_dev_ablity * score.PARTY_DEV_WEIGHT AS partyDevAbility,
+        score.govern_ablity * score.GOVERN_ABLITY_WEIGHT AS governAbility,
+        score.PARTY_DEV_WEIGHT AS partyWeight,
+        score.GOVERN_ABLITY_WEIGHT AS governWeight,
+        score.SERVICE_ABLITY_WEIGHT AS serviceWeight,
+        score.ORG_ID orgId,
+        score.ORG_TYPE orgType
         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'
-        AND parent_id = #{agencyId}
-        AND month_id = #{monthId,jdbcType=VARCHAR}
+        score.del_flag = '0'
+        AND score.parent_id = #{agencyId}
+        AND score.month_id = #{monthId,jdbcType=VARCHAR}
         <if test="customerId != null and customerId != ''">
-            AND  CUSTOMER_ID = #{customerId}
+            AND  score.CUSTOMER_ID = #{customerId}
         </if>
         <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>
-        <if test="sort == 'asc'">
-            ORDER BY index_total ASC
-        </if>
-        <if test="sort == 'desc'">
-            ORDER BY index_total DESC
-        </if>
+        ORDER BY score.index_total ${sort}
         LIMIT #{topNum}
     </select>
 
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
index 301954275f..7ce435c140 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml
@@ -23,35 +23,43 @@
     <select id="selectAnNingSubAgencyIndexYearlyRank" parameterType="com.epmet.evaluationindex.screen.dto.form.SubAgencyIndexRankYMFormDTO"
             resultType="com.epmet.evaluationindex.screen.dto.result.AnNingSubAgencyIndexRankResultDTO">
         SELECT
-        org_name AS `NAME`,
-        govern_ablity AS governAbility,
-        party_dev_ablity AS partyDevAbility,
-        service_ablity AS serviceAbility,
-        ORG_ID orgId,
-        ORG_TYPE orgType
+        score.org_name AS `NAME`,
+        score.govern_ablity AS governAbility,
+        score.party_dev_ablity AS partyDevAbility,
+        score.service_ablity AS serviceAbility,
+        score.ORG_ID orgId,
+        score.ORG_TYPE orgType
         FROM
-        screen_index_data_yearly
+        screen_index_data_yearly 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'
-        AND parent_id = #{agencyId}
-        AND year_id = YEAR(CURDATE())
+        score.del_flag = '0'
+        AND score.parent_id = #{agencyId}
+        AND score.year_id = YEAR(CURDATE())
         <if test="customerId != null and customerId != ''">
-            AND  CUSTOMER_ID = #{customerId}
+            AND  score.CUSTOMER_ID = #{customerId}
         </if>
         <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>
-        <if test="sort == 'asc'">
-            ORDER BY index_total ASC
-        </if>
-        <if test="sort == 'desc'">
-            ORDER BY index_total DESC
-        </if>
+        ORDER BY index_total ${sort}
         LIMIT #{topNum}
     </select>
 </mapper>