难点堵点 查询 如果查询条件为grid 则查询orgId

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/DifficultyRankFormDTO.java

@@ -35,4 +35,9 @@ public class DifficultyRankFormDTO implements Serializable {
 
     @Min(value = 1, groups = {DifficultyRankInternalGroup.class})
     private Integer pageNo;
+
+    /**
+     * 组织类型: 网格：grid ； 组织：agency
+     */
+    private String orgType;
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -249,7 +249,14 @@
             screen_difficulty_data diff
         WHERE
             diff.DEL_FLAG = '0'
+        <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>