From f605590fa86c48a3bd9b8ff14c7be8125a76b566 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 2 Jun 2021 16:26:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=88=E8=BF=9B=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E5=85=B3=E8=81=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenIndexDataMonthlyDao.xml      | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 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 922bb971d1..fdea53df9f 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
@@ -185,28 +185,41 @@
 
     <select id="selectMonthData" resultType="com.epmet.evaluationindex.screen.dto.result.IndexScoreResultDTO">
         SELECT
-            index_total AS "total",
-            (party_dev_ablity * party_dev_weight) AS "party",
-            ROUND(party_dev_ablity,1) partyOriginScore,
-            party_dev_weight AS "partyDevAbilityWeight",
-            (govern_ablity * govern_ablity_weight) AS "govern",
-            ROUND(govern_ablity,1) governOriginScore,
-            govern_ablity_weight AS "governAbilityWeight",
-            (service_ablity * service_ablity_weight) AS "service",
-            ROUND(service_ablity,1) serviceOriginScore,
-            service_ablity_weight AS "serviceAbilityWeight"
+            score.index_total AS "total",
+            (score.party_dev_ablity * score.party_dev_weight) AS "party",
+            ROUND(score.party_dev_ablity,1) partyOriginScore,
+            score.party_dev_weight AS "partyDevAbilityWeight",
+            (score.govern_ablity * score.govern_ablity_weight) AS "govern",
+            ROUND(score.govern_ablity,1) governOriginScore,
+            score.govern_ablity_weight AS "governAbilityWeight",
+            (score.service_ablity * score.service_ablity_weight) AS "service",
+            ROUND(score.service_ablity,1) serviceOriginScore,
+            score.service_ablity_weight AS "serviceAbilityWeight"
         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 org_id = #{orgId}
+            score.del_flag = '0'
+        AND score.org_id = #{orgId}
         <if test="customerId != null and customerId != ''">
-            AND customer_id = #{customerId}
+            AND score.customer_id = #{customerId}
         </if>
         <if test="orgType != null and orgType != '' ">
-            AND org_type = #{orgType}
+            AND score.org_type = #{orgType}
         </if>
-        AND month_id = #{monthId}
+        AND score.month_id = #{monthId}
     </select>
 
     <select id="selectRankList" resultType="com.epmet.evaluationindex.screen.dto.result.IndexAdvanceBranchRankResultDTO">