From 0278936321bc3e10af46259ac59718c5d406f1fb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 17 Dec 2020 17:51:47 +0800 Subject: [PATCH] =?UTF-8?q?/data/report/screen/agency/compartment=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=BF=94?= =?UTF-8?q?=E5=8F=82agencyagencyLevel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/AgencyDistributionResultDTO.java | 11 +++++++++++ .../screen/dto/result/CompartmentResultDTO.java | 5 ++--- .../screen/impl/AgencyServiceImpl.java | 4 ++-- .../mapper/screen/ScreenCustomerAgencyDao.xml | 5 +++-- .../resources/mapper/screen/ScreenCustomerGridDao.xml | 3 ++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java index 3a91fdfbf7..e8822ea470 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java @@ -38,6 +38,17 @@ public class AgencyDistributionResultDTO implements Serializable { */ private String type; + /** + * 若果是组织，对应返回screen_customer_agency的 level + * 机关级别 + * 社区级：community， + * 乡（镇、街道）级:street, + * 区县级: district, + * 市级: city + * 省级:province + */ + private String agencyLevel; + public AgencyDistributionResultDTO() { this.subAreaMarks = ""; this.subCenterMark = ""; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java index b959cf8ea7..c7c219d57a 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java @@ -1,6 +1,5 @@ package com.epmet.evaluationindex.screen.dto.result; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -32,6 +31,7 @@ public class CompartmentResultDTO implements Serializable { private String areaMarks = ""; /** + * 当前组织的级别 * 机关级别 * 社区级：community， * 乡（镇、街道）级:street, @@ -39,8 +39,7 @@ public class CompartmentResultDTO implements Serializable { * 市级: city * 省级:province */ - @JsonIgnore - private String level; + private String agencyLevel; /** * 子级用户分布 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 3232cf7793..ff1fdaabd7 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -195,7 +195,7 @@ public class AgencyServiceImpl implements AgencyService { if (null == agencyAreaInfo){ return new CompartmentResultDTO(); } - if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){ + if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){ // 当level为"community"时，查询screen_customer_grid表 List agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId()); agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS); @@ -213,7 +213,7 @@ public class AgencyServiceImpl implements AgencyService { if (null == agencyAreaInfo){ return new CompartmentResultDTO(); } - if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){ + if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){ // 当level为"community"时，查询screen_customer_grid表 List agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId()); agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS); diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index 9d5338ac65..f61667fb1c 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -44,7 +44,7 @@ agency_id AS agencyId, agency_name AS name, area_marks AS areaMarks, - level AS level + level as agencyLevel FROM screen_customer_agency WHERE @@ -60,7 +60,8 @@ agency_name AS subName, area_marks AS subAreaMarks, center_mark AS subCenterMark, - 'agency' AS type + 'agency' AS type, + level as agencyLevel FROM screen_customer_agency WHERE diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml index 997ad03d98..0262675182 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml @@ -10,7 +10,8 @@ grid_name AS subName, area_marks AS subAreaMarks, center_mark AS subCenterMark, - 'grid' AS type + 'grid' AS type, + '' as agencyLevel FROM screen_customer_grid WHERE