From a28bcd4add42600308aabb57f64bbfdd55671a5d Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Fri, 6 Nov 2020 15:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=BE=E7=82=B9=E5=A0=B5=E7=82=B9=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20=E5=A6=82=E6=9E=9C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=BAgrid=20=E5=88=99=E6=9F=A5=E8=AF=A2or?=
 =?UTF-8?q?gId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/dto/form/DifficultyRankFormDTO.java   |  7 ++++++-
 .../main/resources/mapper/project/ProjectDao.xml  | 15 +++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java
index d043180705..5a3936db6a 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java
@@ -26,7 +26,7 @@ public class DifficultyRankFormDTO implements Serializable {
     /**
      * 排序类型 耗时最长：timelongest；涉及部门最多：mostdepts；处理次数：mosthandled
      */
-    @NotBlank(message = "排序类型不能为空",groups = {DifficultyRankInternalGroup.class})
+    @NotBlank(message = "排序类型不能为空", groups = {DifficultyRankInternalGroup.class})
     private String type;
     /**
      * 获取数据个数 默认前10
@@ -35,4 +35,9 @@ public class DifficultyRankFormDTO implements Serializable {
 
     @Min(value = 1, groups = {DifficultyRankInternalGroup.class})
     private Integer pageNo;
+
+    /**
+     * 组织类型: 网格：grid ； 组织：agency
+     */
+    private String orgType;
 }
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
index 8e5bace8d8..6369d52db7 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml
@@ -249,10 +249,17 @@
             screen_difficulty_data diff
         WHERE
             diff.DEL_FLAG = '0'
-            AND diff.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
-              <if test="status!= null and status != ''">
-                  AND diff.EVENT_STATUS_CODE = #{status}
-              </if>
+        <choose>
+            <when test="orgType != null and orgType == 'grid'">
+                AND diff.ORG_ID = #{agencyId,jdbcType=VARCHAR}
+            </when>
+            <otherwise>
+                AND diff.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
+            </otherwise>
+        </choose>
+        <if test="status!= null and status != ''">
+            AND diff.EVENT_STATUS_CODE = #{status}
+        </if>
          ORDER BY
          CASE #{type}  WHEN 'timelongest' THEN diff.EVENT_COST_TIME
                        WHEN 'mosthandled' THEN diff.EVENT_HANDLED_COUNT