From 50babd183bb8c1fcbd601df3a1289eeab0f4a9ae Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 12 Aug 2021 13:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=BF=9B=E6=8E=92=E8=A1=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2-=E6=B7=BB=E5=8A=A0areaCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/dto/form/AdvancedBranchRankFormDTO.java     |  5 +++--
 .../mapper/screen/ScreenIndexDataMonthlyDao.xml        | 10 +++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
index 27f638f3d2..cd3cf536af 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
@@ -29,8 +29,9 @@ public class AdvancedBranchRankFormDTO implements Serializable {
     private String monthId;
 
     /**
-     * 组织类型 agency grid
+     * areaCode
      */
-    private String orgType;
+    private String areaCode;
+
     public interface AddUserInternalGroup {}
 }
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 ce83c8e058..2eec46bb2c 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
@@ -260,9 +260,17 @@
         WHERE
             dm.del_flag = '0'
         AND rd.del_flag = '0'
+        <choose>
+            <when test="areaCode != null and areaCode != ''">
+                AND org.AREA_CODE LIKE concat(#{areaCode}, '%')
+            </when>
+            <otherwise>
+                AND dm.all_parent_ids LIKE concat('%', #{agencyId}, '%')
+            </otherwise>
+        </choose>
         AND dm.org_type = 'grid'
         AND dm.month_id = #{monthId}
-        AND dm.all_parent_ids LIKE concat('%', #{agencyId}, '%')
+
         ORDER BY dm.index_total DESC
         LIMIT #{topNum}
     </select>