From a166d5b389fb6fa0c10bd639a2c6a35631386ce0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 24 Jun 2021 14:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E4=BC=97=E4=B8=8D=E6=BB=A1=E5=92=8C?= =?UTF-8?q?=E9=9A=BE=E7=82=B9=E8=B5=8C=E7=82=B9=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8F=82areaCode=EF=BC=8C=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E4=BB=8E/data/report/screen/agency/agencydetail=E8=BF=99?= =?UTF-8?q?=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/project/MassesDiscontentFormV2DTO.java | 7 ++++++- .../com/epmet/project/dto/form/DifficultyRankFormDTO.java | 6 +++++- .../service/project/impl/ProjectServiceImpl.java | 8 +++++--- .../src/main/resources/mapper/project/ProjectDao.xml | 6 +++--- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/project/MassesDiscontentFormV2DTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/project/MassesDiscontentFormV2DTO.java index 4c287c8158..55df09cdfe 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/form/project/MassesDiscontentFormV2DTO.java +++ b/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; } 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 db63f70b40..8f62ab848e 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 @@ -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; } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index 86e137b842..4d35a8a9ea 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/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> crmRes = operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId()); + + //06.24决定areaCode让前端传入， 前端从前端从/data/report/screen/agency/agencydetail这取值取值 + /*Result> 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 result = projectDao.difficultyRankV2(formDTO); 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 7566341c5a..888f8b0938 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 @@ -296,10 +296,10 @@ ) diff WHERE diff.DEL_FLAG = '0' - - and diff.AREA_CODE like concat(#{agencyAreaCode},'%') + + and diff.AREA_CODE like concat(#{areaCode},'%') - + AND diff.ORG_ID = #{agencyId,jdbcType=VARCHAR}