From 7b561fb3b62410fd8d68a07101e862632c5ea200 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 4 Jun 2021 16:40:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=94=AF=E9=83=A8=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=98=AF=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=20=E6=89=80=E4=BB=A5=E5=85=B3=E8=81=94grid=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenIndexDataMonthlyDao.xml  | 16 +++-------------
 1 file changed, 3 insertions(+), 13 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 15a410753b..26c21cd8b1 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
@@ -238,19 +238,9 @@
         FROM
             screen_index_data_monthly dm
         INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id
-         <if test="orgType != null and orgType != ''">
-                <choose>
-                    <when test="orgType == 'grid'">
-                        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                    <when test="orgType == 'agency'">
-                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.AGENCY_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                      <when test="orgType == 'department'">
-                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.DEPT_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                </choose>
-            </if>
+        <!--查询的是网格的排行 下面条件是orgType = grid-->
+        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
+
         AND dm.month_id = rd.month_id
         WHERE
             dm.del_flag = '0'