群众不满和难点赌点列表增加入参areaCode，前端从/data/report/screen/agency/agencydetail这取值

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

@@ -43,10 +43,15 @@ public class MassesDiscontentFormV2DTO implements Serializable {
     @NotNull(message = "pageSize不能为空", groups = MassesDiscontentFormV2.class)
     private Integer pageSize;
 
+    /**
+     * 当前agency对应的区域编码，由前端传入，前端从/data/report/screen/agency/agencydetail这取值
+     */
     private String areaCode;
 
-    //以下属性无需前端传入
 
+
+
+    //以下属性无需前端传入
     private String startDate;
     private String endDate;
 }

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

@@ -41,10 +41,14 @@ public class DifficultyRankFormDTO implements Serializable {
      */
     private String orgType;
 
+    /**
+     * 当前agency对应的区域编码，由前端传入，前端从/data/report/screen/agency/agencydetail这取值
+     */
+    private String areaCode;
+
     //以下属性无需前端赋值
     /**
      * 当前登录用户所属客户id
      */
     private String customerId;
-    private String agencyAreaCode;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java

@@ -377,7 +377,9 @@ public class ProjectServiceImpl implements ProjectService {
         //多客户测试写死值，别忘了注释掉呀
         // formDTO.setCustomerId("613cc61a6b8ce4c70d21bd413dac72cc");
         // formDTO.setAgencyId("30705f91f1295ae77d372b868596a5e7");
-        Result<List<String>> crmRes = operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
+
+        //06.24决定areaCode让前端传入， 前端从前端从/data/report/screen/agency/agencydetail这取值取值
+        /*Result<List<String>> crmRes = operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
         if (crmRes.success() && CollectionUtils.isNotEmpty(crmRes.getData())) {
             log.warn("❤当前客户存在子客户❤");
             //2、查询组织信息
@@ -385,8 +387,8 @@ public class ProjectServiceImpl implements ProjectService {
             if (!agencyResult.success() || null == agencyResult.getData()) {
                 throw new RenException(String.format("查询组织信息异常,agencyId:%s", formDTO.getAgencyId()));
             }
-            formDTO.setAgencyAreaCode(agencyResult.getData().getAreaCode());
-        }
+            formDTO.setAreaCode(agencyResult.getData().getAreaCode());
+        }*/
         // 3、升级原来的列表查询接口
         PageHelper.startPage(null == formDTO.getPageNo() ? NumConstant.ONE : formDTO.getPageNo(), formDTO.getTopNum());
         List<ProjectDifficultRankResultDTO> result = projectDao.difficultyRankV2(formDTO);

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

@@ -296,10 +296,10 @@
         ) diff
         WHERE
             diff.DEL_FLAG = '0'
-        <if test="agencyAreaCode != null and agencyAreaCode != ''">
-            and diff.AREA_CODE like concat(#{agencyAreaCode},'%')
+        <if test="areaCode != null and areaCode != ''">
+            and diff.AREA_CODE like concat(#{areaCode},'%')
         </if>
-        <if test="agencyAreaCode == null || agencyAreaCode == ''">
+        <if test="areaCode == null || areaCode == ''">
             <choose>
                 <when test="orgType != null and orgType == 'grid'">
                     AND diff.ORG_ID = #{agencyId,jdbcType=VARCHAR}