From 9bcd84636e3ea3ca67fcf1fbccc1d113cb1f8d5b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 17 Dec 2020 11:15:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=BB=99=E8=AF=9D=E9=A2=98=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E8=A1=A8=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java | 2 +- .../epmet/modules/topic/entity/ResiTopicAttachmentEntity.java | 2 +- .../modules/topic/service/impl/ResiTopicServiceImpl.java | 1 + .../db/migration/V0.0.8__alter_resi_topic_attachment.sql | 4 ++++ 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.8__alter_resi_topic_attachment.sql diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java index 2a6afb9d90..1b57a93f72 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicAttachmentDTO.java @@ -54,7 +54,7 @@ public class ResiTopicAttachmentDTO implements Serializable { private String attachmentFormat; /** - * 附件类型（（图片 - figure、 视频 - video、 语音 - voice、 文档 - doc）） + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） */ private String attachmentType; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java index 16138229bf..ca5980cffc 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicAttachmentEntity.java @@ -54,7 +54,7 @@ public class ResiTopicAttachmentEntity extends BaseEpmetEntity { private String attachmentFormat; /** - * 附件类型（（图片 - figure、 视频 - video、 语音 - voice、 文档 - doc）） + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） */ private String attachmentType; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index a2fc3925b0..9b0d2cf52f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -315,6 +315,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl Date: Thu, 17 Dec 2020 17:51:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?/data/report/screen/agency/compartment?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=BF=94=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 From e2df889b2931e2cd0987cadb93d4c2d2d50236b1 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 17 Dec 2020 23:47:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fact/impl/FactIndexServiceImpl.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java index 01e0a69ac6..e352ba9937 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java @@ -77,12 +77,12 @@ public class FactIndexServiceImpl implements FactIndexService { } //4.根据组织级别判断查询哪类数据表 //区县级、乡镇街道级 - if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { + if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分数据 list = factIndexAgencyScoreDao.selectAgencyAblityWeightScoreIndex(formDTO); //社区级 - } else if ("community".equals(agency.getLevel())) { + } else if ("community".equals(agency.getAgencyLevel())) { //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据 list = factIndexCommunityScoreDao.selectCommunityAblityWeightScore(formDTO); } else { @@ -179,11 +179,11 @@ public class FactIndexServiceImpl implements FactIndexService { } //3.根据组织级别判断查询哪类数据表 //区县级、乡镇街道级 - if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { + if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { //3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分 resultList = factIndexAgencyScoreDao.selectAgencyWeightScoreList(formDTO); //社区级 - } else if ("community".equals(agency.getLevel())) { + } else if ("community".equals(agency.getAgencyLevel())) { //3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分 resultList = factIndexCommunityScoreDao.selectCommunityWeightScoreList(formDTO); } else { @@ -227,12 +227,12 @@ public class FactIndexServiceImpl implements FactIndexService { } //4.根据组织级别判断查询哪类数据表 //区县级、乡镇街道级 - if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { + if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据 list = factIndexAgencyScoreDao.selectAgencyMonthWeightScoreList(formDTO); //社区级 - } else if ("community".equals(agency.getLevel())) { + } else if ("community".equals(agency.getAgencyLevel())) { //4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据 list = factIndexCommunityScoreDao.selectCommunityMonthWeightScoreList(formDTO); } else { @@ -298,8 +298,8 @@ public class FactIndexServiceImpl implements FactIndexService { } //3.根据组织级别拼接查询条件，判断查询不同数据表 //区县级、乡镇街道级 - if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { - if ("district".equals(agency.getLevel())) { + if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { + if ("district".equals(agency.getAgencyLevel())) { formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode()); } else { formDTO.setAllParentIndexCode(FactConstant.JIE_DAO_XIANG_GUAN + ":" + formDTO.getIndexCode()); @@ -307,7 +307,7 @@ public class FactIndexServiceImpl implements FactIndexService { resultList = factIndexAgencySubScoreDao.selectAblityList(formDTO); //社区级 - } else if ("community".equals(agency.getLevel())) { + } else if ("community".equals(agency.getAgencyLevel())) { formDTO.setAllParentIndexCode(FactConstant.SHE_QU_XIANG_GUAN + ":" + formDTO.getIndexCode()); resultList = factIndexCommunitySubScoreDao.selectCommunityAblityList(formDTO); } else { @@ -366,10 +366,10 @@ public class FactIndexServiceImpl implements FactIndexService { } //4.根据组织级别拼接查询条件，判断查询不同数据表 //区县级、乡镇街道级 - if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) { + if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) { resultList = factIndexAgencySubScoreDao.selectMonthAblityList(formDTO); //社区级 - } else if ("community".equals(agency.getLevel())) { + } else if ("community".equals(agency.getAgencyLevel())) { resultList = factIndexCommunitySubScoreDao.selectCommunityMonthAblityList(formDTO); } else { //throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId())); From 87faef26be7883598a45257a01ea4dc8850fea70 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 18 Dec 2020 09:59:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?getAgencyAreaInfo=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E7=95=99level,=E6=B7=BB=E5=8A=A0agencyId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/dto/result/CompartmentResultDTO.java | 3 +++ .../main/resources/mapper/screen/ScreenCustomerAgencyDao.xml | 1 + 2 files changed, 4 insertions(+) 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 c7c219d57a..9e941152e4 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,5 +1,6 @@ package com.epmet.evaluationindex.screen.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -30,6 +31,8 @@ public class CompartmentResultDTO implements Serializable { */ private String areaMarks = ""; + @JsonIgnore + private String level; /** * 当前组织的级别 * 机关级别 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 f61667fb1c..e6aa6f262a 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,6 +44,7 @@ agency_id AS agencyId, agency_name AS name, area_marks AS areaMarks, + level as level, level as agencyLevel FROM screen_customer_agency