From ea836b57bf5fc295c84d4df373e0dd52a7d82eff Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 11:11:25 +0800 Subject: [PATCH 01/30] sql --- .../main/resources/db/migration/V0.0.13__add_column_remark.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql new file mode 100644 index 0000000000..e69de29bb2 From 8b73e7d5fa231df5a9de4ace4ef42f54108283a6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 13:35:08 +0800 Subject: [PATCH 02/30] =?UTF-8?q?28=E3=80=81=E4=BA=BA=E5=91=98=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E5=88=86=E6=9E=90=E4=B8=AD=E7=B1=BB=E5=88=AB=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8F=8F=E8=BF=B0=E6=9B=B4=E6=94=B9=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=8F=98=E6=9B=B4=EF=BC=9A=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20=E2=80=9D=20=20=20=EF=BC=8C=20=20=E7=B1=BB=E5=88=AB=E5=87=8F?= =?UTF-8?q?=E5=B0=91=E6=8F=8F=E8=BF=B0=E6=9B=B4=E6=94=B9=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=8F=98=E6=9B=B4=EF=BC=9A=E5=87=8F=E5=B0=91?= =?UTF-8?q?=20=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcUserChangeRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index caca478526..bc88226da3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -136,9 +136,9 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl Date: Tue, 12 Apr 2022 13:39:03 +0800 Subject: [PATCH 03/30] =?UTF-8?q?21=E3=80=81=E4=BB=8E=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=B8=AD=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=A0=B8?= =?UTF-8?q?=E9=85=B8=E6=A3=80=E6=B5=8B=E5=85=B3=E6=B3=A8=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E4=BA=BA=E5=91=98=EF=BC=8C=E5=85=B3=E6=B3=A8=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E9=BB=98=E8=AE=A4=E5=A1=AB=E5=86=99=E4=B8=BA=E2=80=9C?= =?UTF-8?q?=E6=9C=89=E9=87=8D=E7=82=B9=E5=8C=BA=E5=9F=9F=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcTripReportRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 3766ee7baa..af4c3c0357 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -220,6 +220,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Tue, 12 Apr 2022 13:45:37 +0800 Subject: [PATCH 04/30] =?UTF-8?q?19=E3=80=81=E6=96=B0=E5=A2=9E=E8=A1=8C?= =?UTF-8?q?=E7=A8=8B=E8=AE=B0=E5=BD=95=E6=97=B6=EF=BC=8C=E7=8E=B0=E5=B1=85?= =?UTF-8?q?=E5=9C=B0=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=89=80=E5=9C=A8=E7=BB=84?= =?UTF-8?q?=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/StaffBasicInfoResultDTO.java | 2 +- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java index 52c432f810..c062414971 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java @@ -92,5 +92,5 @@ public class StaffBasicInfoResultDTO implements Serializable { */ private String latitude; - + private String areaCode; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 30203ef9bc..b534d917cb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -25,12 +25,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; @@ -741,6 +744,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Tue, 12 Apr 2022 13:49:10 +0800 Subject: [PATCH 05/30] =?UTF-8?q?=E6=96=B0=E5=A2=9Eremark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcCommunitySelfOrganizationDTO.java | 5 +++++ .../AddCommunitySelfOrganizationFormDTO.java | 5 +++++ .../EditCommunitySelfOrganizationFormDTO.java | 5 +++++ .../CommunitySelfOrganizationListDTO.java | 5 +++++ .../IcCommunitySelfOrganizationEntity.java | 5 +++++ .../ExportCommunitySelfOrganizationExcel.java | 3 +++ .../ImportCommunitySelfOrganization.java | 3 +++ .../migration/V0.0.13__add_column_remark.sql | 1 + .../mapper/IcCommunitySelfOrganizationDao.xml | 1 + .../templates/self_org_import_template.xlsx | Bin 8897 -> 8929 bytes 10 files changed, 33 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java index 6be34cb9b8..52338da6e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java @@ -133,4 +133,9 @@ public class IcCommunitySelfOrganizationDTO implements Serializable { */ private Date updatedTime; + /** + * 备注 + */ + private String remark; + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java index 302f3d08a4..2a693143d3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java @@ -56,6 +56,11 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable { */ private String organizationCreatedTime; + /** + * 备注 + */ + private String remark; + /** * 经度 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java index cade96113f..68d0176e35 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java @@ -68,6 +68,11 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable { */ private String latitude; + /** + * 备注 + */ + private String remark; + /** * 社区自组织ID */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java index 522da610d1..841313378e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java @@ -53,6 +53,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable { */ private String organizationCreatedTime; + /** + * 备注 + */ + private String remark; + /** * 经度 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java index b66e6a0773..fa00ec37e8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java @@ -106,4 +106,9 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 备注 + */ + private String remark; + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java index 1822610552..fdf33d7b48 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ExportCommunitySelfOrganizationExcel.java @@ -31,6 +31,9 @@ public class ExportCommunitySelfOrganizationExcel { @Excel(name = "创建时间", width = 20, needMerge = true) private String organizationCreatedTime; + @Excel(name = "备注", width = 60, needMerge = true) + private String remark; + @ExcelCollection(name = "组织成员") private List organizationPersonnel; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java index a6c6102431..25a8f27af9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/ImportCommunitySelfOrganization.java @@ -40,6 +40,9 @@ public class ImportCommunitySelfOrganization extends ExcelVerifyInfo { @Excel(name = "创建时间", needMerge = true) private String organizationCreatedTime; + @Excel(name = "备注", needMerge = true) + private String remark; + @ExcelCollection(name = "组织成员") private List persons; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql index e69de29bb2..9a747fa8a4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.13__add_column_remark.sql @@ -0,0 +1 @@ +alter table ic_community_self_organization add COLUMN REMARK VARCHAR(500) comment '备注' AFTER ORGANIZATION_CREATED_TIME; \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index d2575e0af0..e2d2d0ea17 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -14,6 +14,7 @@ LONGITUDE = #{longitude}, LATITUDE = #{latitude}, ORGANIZATION_CREATED_TIME = #{organizationCreatedTime}, + REMARK = #{remark}, UPDATED_TIME = NOW(), UPDATED_BY = #{updatedBy} WHERE DEL_FLAG = 0 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx index aa0edb41674bd700b187f4f2920101612458ff9f..0893eff4043bcfe48484b01b71c8565b4ac31a24 100644 GIT binary patch delta 4909 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 Date: Tue, 12 Apr 2022 14:16:22 +0800 Subject: [PATCH 06/30] =?UTF-8?q?24=E3=80=81=E5=B0=8F=E5=8C=BA=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E6=88=BF=E5=B1=8B=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=87=BA=E7=A7=9F=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=9A=E5=87=BA=E7=A7=9F=E3=80=81=E9=97=B2?= =?UTF-8?q?=E7=BD=AE=E3=80=81=E8=87=AA=E4=BD=8F=EF=BC=9B=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E6=98=AF--=E5=87=BA=E7=A7=9F?= =?UTF-8?q?=EF=BC=8C=E5=90=A6--=E8=87=AA=E4=BD=8F=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E8=87=AA=E4=BD=8F=EF=BC=9B=E6=88=BF?= =?UTF-8?q?=E5=B1=8B=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E5=BA=94=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcHouseFormDTO.java | 4 ++-- .../com/epmet/dto/form/ListIcNeighborHoodFormDTO.java | 4 ++++ .../src/main/java/com/epmet/enums/HouseRentFlagEnums.java | 8 ++++++-- .../main/java/com/epmet/controller/HouseController.java | 7 +++---- .../src/main/java/com/epmet/dao/IcHouseDao.java | 3 ++- .../src/main/java/com/epmet/service/HouseService.java | 3 ++- .../java/com/epmet/service/impl/HouseServiceImpl.java | 5 +++-- .../src/main/resources/mapper/IcHouseDao.xml | 7 +++++-- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java index fb679755d7..5fe1c6c4db 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java @@ -79,9 +79,9 @@ public class IcHouseFormDTO implements Serializable { private String purpose; /** - * 1出租；0未出租 + * 1：出租 0：自住 2：闲置 */ - @NotNull(message = "是否出租不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) + @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) private Integer rentFlag; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java index 402c86c868..613ee6f3d2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java @@ -62,6 +62,10 @@ public class ListIcNeighborHoodFormDTO implements Serializable{ * 房主电话 */ private String ownerPhone; + /** + * 房屋状态 【1：出租 0：自住 2：闲置】 + */ + private String rentFlag; /** * 数据类型【小区：neighbourHood，楼栋：building，房屋：house】 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java index 618be0ea9a..27cd699bf3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java @@ -3,8 +3,12 @@ package com.epmet.enums; import org.springframework.util.StringUtils; public enum HouseRentFlagEnums { - YES(1,"是"), - NO(0,"否"); + //原有的房屋出租状态是否改为房屋状态【1：出租 0：自住 2：闲置】 + /*YES(1,"是"), + NO(0,"否");*/ + HOUSE_ZZ(0,"自住"), + HOUSE_CZ(1,"出租"), + HOUSE_XZ(2,"闲置"); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 09f29f5330..369fa24d40 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -92,9 +92,8 @@ public class HouseController implements ResultDataResolver { String queryScene = "house_manage"; IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(), - formDTO.getOwnerPhone(), null, - null, queryScene, - formDTO.getPageNo(), formDTO.getPageSize()); + formDTO.getOwnerPhone(), null, null, queryScene, + formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getRentFlag()); return new Result().ok(icNeighborHoodResultDTO); } @@ -142,7 +141,7 @@ public class HouseController implements ResultDataResolver { null); IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null, - neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize()); + neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(), null); return new Result().ok(icNeighborHoodResultDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index c5a392e6ca..ed7ba8a969 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -38,7 +38,8 @@ public interface IcHouseDao extends BaseDao { @Param("ownerPhone") String ownerPhone, @Param("neighborHoodName") String neighborHoodName, @Param("buildingName") String buildingName, - @Param("queryScene") String queryScene); + @Param("queryScene") String queryScene, + @Param("rentFlag") String rentFlag); List searchAllHouse(@Param("house") IcHouseEntity house); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index a651ed1615..71c435bdf8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -62,7 +62,8 @@ public interface HouseService { String buildingName, String queryScene, Integer pageNo, - Integer pageSize); + Integer pageSize, + String rentFlag); void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 03458a90fd..04890b50a1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -256,7 +256,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { String buildingName, String queryScene, Integer pageNo, - Integer pageSize) { + Integer pageSize, + String rentFlag) { IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); //如果类型是house 查房屋 //IPage> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize); @@ -280,7 +281,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { IPage page = new Page(pageNo,pageSize); - IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene); + IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene, rentFlag); List> records = mapIPage.getRecords(); records.forEach(item->{ item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 0db3dfa93e..fc49465d73 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -154,7 +154,7 @@ b.BUILDING_NAME as buildingName, d.UNIT_NUM as unitNum, a.DOOR_NAME as doorName, - if(a.RENT_FLAG=1,'是','否') as rentFlag, + if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag, a.OWNER_NAME as ownerName, /*a.RENT_FLAG as rentFlag, a.PURPOSE as purpose,*/ @@ -197,6 +197,9 @@ AND b.BUILDING_NAME like CONCAT('%',#{buildingName},'%') + + AND a.rent_flag = #{rentFlag} + /*排序规则：如果是社区查询则根据小区、楼栋、单元、房屋名字分别升序排序*/ @@ -220,7 +223,7 @@ a.DOOR_NAME as doorName, a.HOUSE_TYPE as houseType, a.PURPOSE as purpose, - if(a.RENT_FLAG=1,'是','否') as rentFlag, + if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag, a.OWNER_NAME as ownerName, a.OWNER_PHONE as ownerPhone, a.OWNER_ID_CARD as ownerIdCard, From b805ecd365bb6935ad04b10e4b53da0e20566e10 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 Apr 2022 14:26:34 +0800 Subject: [PATCH 07/30] =?UTF-8?q?29=E3=80=81=E5=88=9D=E5=BF=83=E4=BA=92?= =?UTF-8?q?=E5=8A=A9=E4=B8=AD=E5=85=AC=E7=9B=8A=E8=BE=BE=E4=BA=BA=E3=80=81?= =?UTF-8?q?=E5=85=9A=E5=91=98=E5=85=88=E9=94=8B=E6=8E=92=E8=A1=8C=EF=BC=8C?= =?UTF-8?q?0=E5=88=86=E4=BA=BA=E5=91=98=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9C=A8=E6=A6=9C=E5=8D=95=E4=B8=8A=EF=BC=8C=E6=A6=9C=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E6=88=90=E5=91=98=E7=82=B9=E5=87=BB=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E5=8F=AF=E6=9F=A5=E7=9C=8B=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml index 2851c5a835..add7341a75 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml @@ -163,6 +163,7 @@ WHERE u.del_flag = '0' AND PARTY_FLAG = 0 + AND u.point_total > 0 AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%') @@ -207,6 +208,7 @@ WHERE u.del_flag = '0' AND party_flag = '1' + and u.point_total > 0 AND u.all_parent_ids LIKE CONCAT('%',#{orgId},'%') From 9806a961b5b60542e84f1f8ed6c80d0b8b0a63b3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 14:47:12 +0800 Subject: [PATCH 08/30] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunitySelfOrganizationListDTO.java | 1 + .../mapper/IcCommunitySelfOrganizationDao.xml | 3 +- .../dto/form/ListIcNeighborHoodFormDTO.java | 5 +++ .../com/epmet/controller/HouseController.java | 7 ++-- .../main/java/com/epmet/dao/IcHouseDao.java | 4 ++- .../java/com/epmet/service/HouseService.java | 2 ++ .../epmet/service/impl/HouseServiceImpl.java | 36 +++++++++++-------- .../src/main/resources/mapper/IcHouseDao.xml | 20 ++++++++--- 8 files changed, 54 insertions(+), 24 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java index 841313378e..b7a7627030 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java @@ -92,6 +92,7 @@ public class CommunitySelfOrganizationListDTO implements Serializable { this.longitude = ""; this.latitude = ""; this.orgId = ""; + this.remark = ""; this.score = NumConstant.ZERO; this.organizationPersonnel = new ArrayList<>(); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index e2d2d0ea17..2099c1cce3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -53,7 +53,8 @@ so.SERVICE_ITEM AS serviceItem, so.LONGITUDE AS longitude, so.LATITUDE AS latitude, - so.ID as orgId + so.ID as orgId, + so.remark FROM ic_community_self_organization so WHERE so.DEL_FLAG = 0 AND so.ORG_ID = #{agencyId} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java index 613ee6f3d2..6f25dce319 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java @@ -85,5 +85,10 @@ public class ListIcNeighborHoodFormDTO implements Serializable{ */ private String keyword; + /** + * 1：出租 0：自住 2：闲置 + */ + private String rentFlag; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 369fa24d40..d001801185 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -92,8 +92,9 @@ public class HouseController implements ResultDataResolver { String queryScene = "house_manage"; IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(), - formDTO.getOwnerPhone(), null, null, queryScene, - formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getRentFlag()); + formDTO.getOwnerPhone(), null, + null, queryScene, + formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getId(),formDTO.getLevel(),formDTO.getRentFlag()); return new Result().ok(icNeighborHoodResultDTO); } @@ -141,7 +142,7 @@ public class HouseController implements ResultDataResolver { null); IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null, - neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(), null); + neighborhoodName, buildingName, scene, formDTO.getPageNo(), formDTO.getPageSize(),null,null,null); return new Result().ok(icNeighborHoodResultDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index ed7ba8a969..7738139521 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -39,7 +39,9 @@ public interface IcHouseDao extends BaseDao { @Param("neighborHoodName") String neighborHoodName, @Param("buildingName") String buildingName, @Param("queryScene") String queryScene, - @Param("rentFlag") String rentFlag); + @Param("id")String id, + @Param("level")String level, + @Param("rentFlag")String rentFlag); List searchAllHouse(@Param("house") IcHouseEntity house); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 71c435bdf8..59e7e3c973 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -63,6 +63,8 @@ public interface HouseService { String queryScene, Integer pageNo, Integer pageSize, + String id, + String level, String rentFlag); void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 04890b50a1..cbf82419a4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -257,7 +257,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { String queryScene, Integer pageNo, Integer pageSize, - String rentFlag) { + String id,String level, String rentFlag) { IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); //如果类型是house 查房屋 //IPage> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize); @@ -265,23 +265,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { // 查询pids String pids = null; if (StringUtils.isNotBlank(ancestorAgencyId)) { - CustomerAgencyDTO agency = agencyservice.getAgencyById(ancestorAgencyId); - - if (agency == null) { - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败"); - } - - - if (NumConstant.ZERO_STR.equals(agency.getPid())) { - pids = ancestorAgencyId; - } else { - pids = agency.getPids().concat(StrConstant.COLON).concat(ancestorAgencyId); - } + pids = getPids(ancestorAgencyId); + } + if (StringUtils.isNotBlank(level) && level.equals("agency")){ + pids = getPids(ancestorAgencyId); } IPage page = new Page(pageNo,pageSize); - IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene, rentFlag); + IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene,id,level,rentFlag); List> records = mapIPage.getRecords(); records.forEach(item->{ item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); @@ -292,6 +284,22 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { result.setList(records); return result; } + public String getPids(String agencyId){ + String pids = null; + CustomerAgencyDTO agency = agencyservice.getAgencyById(agencyId); + + if (agency == null) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败"); + } + + + if (NumConstant.ZERO_STR.equals(agency.getPid())) { + pids = agencyId; + } else { + pids = agency.getPids().concat(StrConstant.COLON).concat(agencyId); + } + return pids; + } @Override public void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index fc49465d73..9150a4f6fc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -175,16 +175,26 @@ LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0' LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0' - a.del_flag = '0' + a.del_flag = '0' - and case c.AGENCY_PIDS - when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%') - else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%') - end + and case c.AGENCY_PIDS when '' then CONCAT(c.AGENCY_ID) like CONCAT(#{pids}, '%') + else CONCAT(c.AGENCY_PIDS, ':', c.AGENCY_ID) like CONCAT(#{pids}, '%') end AND a.BUILDING_ID = #{buildingId} + + AND c.GRID_ID = #{id} + + + AND c.id = #{id} + + + AND b.id = #{id} + + + AND a.RENT_FLAG = #{rentFlag} + AND a.OWNER_NAME like concat('%',#{ownerName},'%') From 006d263997d2bf202509fd2d60cf8ea63fd12fe4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 14:55:21 +0800 Subject: [PATCH 09/30] areaCodePath --- .../redis/common/bean/AgencyInfoCache.java | 6 ++ .../entity/govorg/CustomerAgencyEntity.java | 7 ++ .../govorg/impl/GovOrgServiceImpl.java | 76 ++++++++++--------- .../dto/result/StaffBasicInfoResultDTO.java | 5 +- .../impl/CustomerStaffServiceImpl.java | 2 +- 5 files changed, 58 insertions(+), 38 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java index 684440db65..1a842d3987 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Author zxc @@ -59,6 +60,11 @@ public class AgencyInfoCache implements Serializable { */ private String areaCode; + /** + * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 + */ + private List areaCodePath; + /** * 删除标识 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java index 171e01198f..28bf2d90a8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java @@ -22,6 +22,8 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 机关单位信息表 * @@ -74,6 +76,11 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { */ private String areaCode; + /** + * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 + */ + private List areaCodePath; + /** * 总人数 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 4d1b356fd3..dd8f54cab7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.alibaba.fastjson.JSON; import com.dingtalk.api.request.OapiRobotSendRequest; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.DingDingRobotConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -250,41 +251,6 @@ public class GovOrgServiceImpl implements GovOrgService { return result; } - public static void main(String[] args) { - List allList = new ArrayList<>(); - NextAreaCodeResultDTO m1 = new NextAreaCodeResultDTO(); - m1.setAreaCode("1"); - m1.setAreaName("a"); - allList.add(m1); - - NextAreaCodeResultDTO m2 = new NextAreaCodeResultDTO(); - m2.setAreaCode("2"); - m2.setAreaName("b"); - allList.add(m2); - - - NextAreaCodeResultDTO m3 = new NextAreaCodeResultDTO(); - m3.setAreaCode("3"); - m3.setAreaName("c"); - allList.add(m3); - - List stringList = new ArrayList<>(); - stringList.add("1"); - stringList.add("2"); - - Iterator iterator = allList.iterator(); - while (iterator.hasNext()) { - NextAreaCodeResultDTO next = iterator.next(); - for (String usedAreaCode : stringList) { - if (next.getAreaCode().equals(usedAreaCode)) { - iterator.remove(); - } - } - - } - System.out.println(JSON.toJSONString(allList, true)); - } - /** * @param staffId * @Author sun @@ -643,7 +609,45 @@ public class GovOrgServiceImpl implements GovOrgService { */ @Override public CustomerAgencyEntity getAgencyInfo(String agencyId) { - return customerAgencyDao.selectById(agencyId); + CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId); + //设置行政地区编码全路径 + if (StringUtils.isNotBlank(customerAgencyEntity.getAreaCode()) && StringUtils.isNotBlank(customerAgencyEntity.getParentAreaCode())) { + customerAgencyEntity.setAreaCodePath(queryAreaCodePath(customerAgencyEntity)); + } + + return customerAgencyEntity; + } + + private List queryAreaCodePath(CustomerAgencyEntity customerAgencyEntity) { + List areaCodePath = new ArrayList<>(); + switch (customerAgencyEntity.getLevel()) { + case Constant.COMMUNITY: + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO)); + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR)); + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.SIX)); + areaCodePath.add(customerAgencyEntity.getParentAreaCode()); + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + case Constant.STREET: + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO)); + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR)); + areaCodePath.add(customerAgencyEntity.getParentAreaCode()); + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + case Constant.DISTRICT: + areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO)); + areaCodePath.add(customerAgencyEntity.getParentAreaCode()); + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + case Constant.CITY: + areaCodePath.add(customerAgencyEntity.getParentAreaCode()); + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + case Constant.PROVINCE: + areaCodePath.add(customerAgencyEntity.getAreaCode()); + break; + } + return areaCodePath; } /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java index c062414971..33416972ae 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/StaffBasicInfoResultDTO.java @@ -92,5 +92,8 @@ public class StaffBasicInfoResultDTO implements Serializable { */ private String latitude; - private String areaCode; + /** + * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 + */ + private List areaCodePath; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index b534d917cb..2991b7e39c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -745,7 +745,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl()); } //获取工作人员所属客户名 CustomerDTO dto = new CustomerDTO(); From 784881e7fce4328074c6512b1b614df56e684bca Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 15:01:13 +0800 Subject: [PATCH 10/30] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/IcPartyActivityDTO.java | 3 +- .../epmet/dto/form/PartyActivityFormDTO.java | 1 + .../dto/form/work/PublishActInfoFormDTO.java | 2 +- .../epmet/dto/form/work/RePublishFormDTO.java | 2 ++ .../work/CanceledActDetailResultDTO.java | 2 ++ .../work/FinishedActDetailResultDTO.java | 3 ++ .../work/InProgressActDetailResultDTO.java | 3 ++ .../result/work/ReEditActInfoResultDTO.java | 3 ++ .../epmet/entity/IcPartyActivityEntity.java | 2 +- .../impl/IcPartyActivityServiceImpl.java | 28 +++++++++++++++ .../service/impl/WorkActServiceImpl.java | 34 +++++++++++++++++++ .../resources/mapper/IcPartyActivityDao.xml | 3 ++ 12 files changed, 83 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index bcb04fb6ef..23451a79d7 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -57,7 +57,8 @@ public class IcPartyActivityDTO implements Serializable { */ @JsonIgnore private String agencyId; - + private String gridId; + private String gridName; /** * 组织的所有上级 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java index 1f108568e1..0481b07fc4 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/PartyActivityFormDTO.java @@ -19,6 +19,7 @@ public class PartyActivityFormDTO implements Serializable { private static final long serialVersionUID = -2510068555703677L; @NotBlank(message = "组织Id不能为空" ) private String agencyId; + private String gridId; private String unitId; private String title; @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java index 099fa38e60..57e0358505 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java @@ -36,7 +36,7 @@ public class PublishActInfoFormDTO implements Serializable { * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的 */ private String actDraftId; - + private String gridId; /** * 客户id */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java index 587a60a0ff..7dfc46329f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java @@ -36,6 +36,8 @@ public class RePublishFormDTO implements Serializable { */ private String actDraftId; + private String gridId; + /** * 活动id */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java index 764d3ffabf..61f6eae029 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java @@ -153,6 +153,8 @@ public class CanceledActDetailResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java index 5bf9c4bfb1..26aa13d4a1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java @@ -142,6 +142,9 @@ public class FinishedActDetailResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java index 03fdbf576b..f220f19a96 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java @@ -137,6 +137,9 @@ public class InProgressActDetailResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java index 367ab0ec1d..e4db367ee0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java @@ -154,6 +154,9 @@ public class ReEditActInfoResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java index 4919fdd133..da03e372e7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyActivityEntity.java @@ -47,7 +47,7 @@ public class IcPartyActivityEntity extends BaseEpmetEntity { * 组织ID */ private String agencyId; - + private String gridId; /** * 组织的所有上级 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java index b72739dbbc..ce0b172893 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyActivityServiceImpl.java @@ -28,7 +28,9 @@ import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; @@ -123,6 +125,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA)); List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); + if (StringUtils.isNotEmpty(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName(gridInfo.getGridName()); + } + } }); } @@ -150,6 +158,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl unitIds = Arrays.asList(dto.getUnitId().split(StrConstant.COMMA)); List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); dto.setUnitName(StringUtils.join(unitNames, StrConstant.COMMA)); + if (StringUtils.isNotEmpty(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName(gridInfo.getGridName()); + } + } }); } @@ -171,6 +185,12 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList()); dto.setServiceMatterList(services); dto.setServiceMatterNameList(serviceNames); + if (StringUtils.isNotEmpty(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName(gridInfo.getGridName()); + } + } //获取单位 //获取组织下联建单位 @@ -547,6 +567,14 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl services = Arrays.asList(dto.getServiceMatter().split(StrConstant.COMMA)); List serviceNames = services.stream().map(categoryMap::get).collect(Collectors.toList()); dto.setServiceMatterName(StringUtils.join(serviceNames, StrConstant.SEMICOLON)); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName(gridInfo.getGridName()); + } + } + }); } PageInfo pageInfo = new PageInfo<>(dtoList); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 7ab8dc2e52..e12a501ae1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -9,6 +9,8 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -832,6 +834,14 @@ public class WorkActServiceImpl implements WorkActService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); canceledActDetailResultDTO.setUnitIdList(unitIds); canceledActDetailResultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + canceledActDetailResultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + canceledActDetailResultDTO.setGridName(gridInfo.getGridName()); + } + } } } } @@ -897,6 +907,14 @@ public class WorkActServiceImpl implements WorkActService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); resultDTO.setUnitIdList(unitIds); resultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + resultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + resultDTO.setGridName(gridInfo.getGridName()); + } + } } } } @@ -986,6 +1004,14 @@ public class WorkActServiceImpl implements WorkActService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); resultDTO.setUnitIdList(unitIds); resultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + resultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + resultDTO.setGridName(gridInfo.getGridName()); + } + } } } } @@ -1390,6 +1416,14 @@ public class WorkActServiceImpl implements WorkActService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); resultDTO.setUnitIdList(unitIds); resultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(dto.getGridId())) { + resultDTO.setGridId(dto.getGridId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + resultDTO.setGridName(gridInfo.getGridName()); + } + } } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 429461fbfb..ceaae8342e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -95,6 +95,9 @@ WHERE a.DEL_FLAG = '0' AND a.AGENCY_ID = #{agencyId} + + AND a.GRID_ID = #{gridId} + AND TITLE LIKE concat('%', #{title}, '%') From 7919e756ffc06ce305e106f3a3ef91836899562d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 15:02:07 +0800 Subject: [PATCH 11/30] ... --- .../java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java index 6f25dce319..613ee6f3d2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java @@ -85,10 +85,5 @@ public class ListIcNeighborHoodFormDTO implements Serializable{ */ private String keyword; - /** - * 1：出租 0：自住 2：闲置 - */ - private String rentFlag; - } From b6097c76c4143ae1b56f10faf67b9098f6eb7799 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 Apr 2022 15:04:19 +0800 Subject: [PATCH 12/30] =?UTF-8?q?35=E3=80=81=E8=81=94=E5=BB=BA=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E7=9A=84=E5=88=86=E7=B1=BB=E5=8F=98=E6=9B=B4=E4=B8=BA?= =?UTF-8?q?=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.12__up_sys_dict_data.sql | 17 +++++++++++++++++ .../commons/tools/enums/PartyUnitTypeEnum.java | 15 ++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql new file mode 100644 index 0000000000..7d93d8bc97 --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.12__up_sys_dict_data.sql @@ -0,0 +1,17 @@ + + +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000220', `dict_label` = '区域化党建单位--楼宇党建' +WHERE (`id` = '1000000000000000200'); +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000221', `dict_label` = '区域化党建单位--两新组织' +WHERE (`id` = '1000000000000000201'); +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000222', `dict_label` = '区域化党建单位--区域单位党建' +WHERE (`id` = '1000000000000000202'); +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000223', `dict_label` = '区域化党建单位--机关直属部门' +WHERE (`id` = '1000000000000000203'); +UPDATE `epmet_admin`.`sys_dict_data` SET `id` = '1000000000000000224', `dict_label` = '区域化党建单位--其他' +WHERE (`id` = '1000000000000000204'); + +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000225', '1000000000000000007', '社会组织--社会团体', '5', '0', '', '5', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000226', '1000000000000000007', '社会组织--民办非企业单位', '6', '0', '', '6', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000227', '1000000000000000007', '社会组织--基金会', '7', '0', '', '7', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000228', '1000000000000000007', '社会组织--其他', '8', '0', '', '8', '0', '0', '', '2022-04-12 14:39:18', '', '2022-04-12 14:39:18'); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java index 6d7aee6009..27807a6d9a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/PartyUnitTypeEnum.java @@ -7,11 +7,16 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; */ public enum PartyUnitTypeEnum { //房屋类型，1楼房，2平房，3别墅 - LOUYU("0", "楼宇党建"), - ZUZHI("1", "两新组织"), - DANWEI("2", "区域单位党建"), - JIGUAN("3", "机关直属部门"), - QITA("4", "其他"); + LOUYU("0", "区域化党建单位--楼宇党建"), + ZUZHI("1", "区域化党建单位--两新组织"), + DANWEI("2", "区域化党建单位--区域单位党建"), + JIGUAN("3", "区域化党建单位--机关直属部门"), + QITA("4", "区域化党建单位--其他"), + SHZZ_SHTT("5", "社会组织--社会团体"), + SHZZ_MBFQYDW("6", "社会组织--民办非企业单位"), + SHZZ_JJH("7", "社会组织--基金会"), + SHZZ_QT("8", "社会组织--其他"); + private String code; private String name; From b16c915c3c005fdaff5e1ee2296b4a67c81dd3cb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 Apr 2022 15:11:50 +0800 Subject: [PATCH 13/30] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.15__alter_ic_house.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql new file mode 100644 index 0000000000..d624bf775a --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql @@ -0,0 +1,2 @@ +ALTER TABLE `ic_house` +MODIFY COLUMN `RENT_FLAG` tinyint(1) NOT NULL COMMENT '1：出租 0：自住 2：闲置' AFTER `PURPOSE`; From ce53355d75dbccad26956f098e3092f55ea81b33 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 15:16:04 +0800 Subject: [PATCH 14/30] areaCodePath --- .../com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java | 2 ++ .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 2 +- .../main/resources/mapper/govorg/CustomerAgencyDao.xml | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index c9ebd4bf8d..8b64711e1f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -105,4 +105,6 @@ public interface CustomerAgencyDao extends BaseDao { * @author sun */ LinkedList subAgencyListAndGridSumNum(@Param("agencyId") String agencyId); + + CustomerAgencyEntity selectByAgencyId(@Param("agencyId")String agencyId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index dd8f54cab7..0b6944ce68 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -609,7 +609,7 @@ public class GovOrgServiceImpl implements GovOrgService { */ @Override public CustomerAgencyEntity getAgencyInfo(String agencyId) { - CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId); + CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectByAgencyId(agencyId); //设置行政地区编码全路径 if (StringUtils.isNotBlank(customerAgencyEntity.getAreaCode()) && StringUtils.isNotBlank(customerAgencyEntity.getParentAreaCode())) { customerAgencyEntity.setAreaCodePath(queryAreaCodePath(customerAgencyEntity)); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index e5594fdb5e..9e654e9bec 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -299,4 +299,12 @@ ORDER BY created_time ASC + From 57616b0ab1efc9bf21ef47bf08552118c96abf62 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 15:23:36 +0800 Subject: [PATCH 15/30] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 2991b7e39c..21a84aa6ad 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -25,15 +25,12 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; @@ -744,8 +741,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl()); + // AgencyInfoCache agency=CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId()); + // resultDTO.setAreaCodePath(null != agency && !CollectionUtils.isEmpty(agency.getAreaCodePath()) ? agency.getAreaCodePath() : new ArrayList<>()); } //获取工作人员所属客户名 CustomerDTO dto = new CustomerDTO(); From 10570eaae57fe8aec5449c056d0600c473736466 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 15:41:31 +0800 Subject: [PATCH 16/30] =?UTF-8?q?=E6=96=B0=E5=BC=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 12 ++++ .../com/epmet/service/BuildingService.java | 1 + .../service/impl/BuildingServiceImpl.java | 65 +++++++++++++++++++ .../src/main/resources/mapper/IcHouseDao.xml | 5 +- 4 files changed, 82 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index fca09fe069..6ca644bd31 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -118,6 +118,18 @@ public class BuildingController { List buildingTreeLevelDTOS =buildingService.treeList(tokenDTO.getCustomerId(), tokenDTO.getUserId()); return new Result().ok(buildingTreeLevelDTOS); } + + /** + * Desc: 根据前端方便，新开接口，只返回树的ID + * @param tokenDTO + * @author zxc + * @date 2022/4/12 15:20 + */ + @PostMapping("tree-ids") + public Result treeIds(@LoginUser TokenDto tokenDTO){ + List ids =buildingService.treeIds(tokenDTO.getCustomerId(), tokenDTO.getUserId()); + return new Result().ok(ids); + } /** * 导出模板 * @param response diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 81a9f10390..d5d1dd7903 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -57,6 +57,7 @@ public interface BuildingService { void addBuilding(String customerId, IcBulidingFormDTO formDTO); List treeList(String customerId, String staffId); + List treeIds(String customerId, String staffId); List importExcel(String customerId, List list, String staffId, List numList); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 04670fde28..d178eb7540 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -261,6 +261,71 @@ public class BuildingServiceImpl implements BuildingService { } + @Override + public List treeIds(String customerId, String staffId) { + List result = new ArrayList<>(); + CustomerStaffInfoCacheResult agency = CustomerStaffRedis.getStaffInfo(customerId, staffId); + if(null == agency || StringUtils.isBlank(agency.getAgencyId())){ + log.error("com.epmet.service.impl.BuildingServiceImpl.treeIds，没有找到工作人员所属的机关信息，用户Id：{}",staffId); + return new ArrayList<>(); + } + //1.获取所在组织及下级组织 + CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(agency.getAgencyId()); + List customerAgencyList = icBuildingDao.selectAgencyChildrenList(agency.getAgencyId()); + customerAgencyList.add(customerAgency); + if(CollectionUtils.isEmpty(customerAgencyList)){ + return new ArrayList<>(); + } + result.addAll(customerAgencyList.stream().map(m -> m.getId()).collect(Collectors.toList())); + List agencyList = customerAgencyList.stream().map(item -> { + BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); + buildingTreeLevelDTO.setId(item.getId()); + buildingTreeLevelDTO.setPId(item.getPid()); + buildingTreeLevelDTO.setLabel(item.getOrganizationName()); + buildingTreeLevelDTO.setLevel(item.getLevel()); + buildingTreeLevelDTO.setLongitude(item.getLongitude()); + buildingTreeLevelDTO.setLatitude(item.getLatitude()); + buildingTreeLevelDTO.setChildren(new ArrayList<>()); + //当前组织有几个下级组织 + buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); + return buildingTreeLevelDTO; + }).collect(Collectors.toList()); + //2.获取组织所在网格 + List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList)); + if(CollectionUtils.isEmpty(customerGridList)){ + return result; + } + result.addAll(customerGridList.stream().map(m -> m.getId()).collect(Collectors.toList())); + List gridList = customerGridList.stream().map(item -> { + BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); + buildingTreeLevelDTO.setId(item.getId()); + buildingTreeLevelDTO.setLabel(item.getGridName()); + buildingTreeLevelDTO.setLevel("grid"); + buildingTreeLevelDTO.setPId(item.getPid()); + buildingTreeLevelDTO.setLongitude(item.getLongitude()); + buildingTreeLevelDTO.setLatitude(item.getLatitude()); + buildingTreeLevelDTO.setChildren(new ArrayList<>()); + //当前网格下有几个小区 + buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); + return buildingTreeLevelDTO; + }).collect(Collectors.toList()); + + + //3.获取网格下的所有小区 + List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .in(IcNeighborHoodEntity::getGridId, gridIdList) + .orderByAsc(IcNeighborHoodEntity::getCreatedTime); + List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); + if(CollectionUtils.isEmpty(icNeighborHoodList)){ + agencyList.addAll(gridList); + return result; + } + result.addAll(icNeighborHoodList.stream().map(m -> m.getId()).collect(Collectors.toList())); + return result; + } + @Override @Transactional(rollbackFor = Exception.class) public List importExcel(String customerId, List list, String staffId, List numList) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 9150a4f6fc..d472f38195 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -154,7 +154,10 @@ b.BUILDING_NAME as buildingName, d.UNIT_NUM as unitNum, a.DOOR_NAME as doorName, - if(a.RENT_FLAG=0,'自住',if(a.RENT_FLAG=1,'出租','闲置')) as rentFlag, + (case when a.RENT_FLAG = '0' then '自住' + when a.RENT_FLAG = '1' then '出租' + when a.RENT_FLAG = '2' then '闲置' + else '' end) as rentFlag, a.OWNER_NAME as ownerName, /*a.RENT_FLAG as rentFlag, a.PURPOSE as purpose,*/ From 13976e464042336e9e111836cd265f4932103788 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 15:43:06 +0800 Subject: [PATCH 17/30] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/LatestActInfoDTO.java | 2 +- .../com/epmet/dto/form/work/DraftActInfoFormDTO.java | 2 +- .../epmet/dto/result/work/ActPreviewResultDTO.java | 3 +++ .../dto/result/work/LatestDraftActInfoResultDTO.java | 1 + .../epmet/service/impl/WorkActDraftServiceImpl.java | 11 ++++++++++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java index e73c466837..d4cc64d386 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java @@ -43,7 +43,7 @@ public class LatestActInfoDTO implements Serializable { * 客户id */ private String customerId; - + private String gridId; /** * 活动标题 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java index a88d1d393f..08c6c8def7 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/DraftActInfoFormDTO.java @@ -28,7 +28,7 @@ public class DraftActInfoFormDTO implements Serializable { * 活动草稿id,如果是编辑之前的活动草稿，此列是有值的 */ private String actDraftId; - + private String gridId; /** * 如果是重新发布活动，此列是有值的 diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java index caeed480d5..b1856da3b3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewResultDTO.java @@ -101,6 +101,9 @@ public class ActPreviewResultDTO implements Serializable { */ private String actType; + private String gridId; + private String gridName; + /** * 联建单位 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java index 70b4c5754f..e5699f1140 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java @@ -21,6 +21,7 @@ public class LatestDraftActInfoResultDTO implements Serializable { * 活动草稿id */ private String actDraftId; + private String gridId; /** * 客户id */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java index 1273ffa577..a5fb199d5a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java @@ -2,6 +2,8 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.constant.ActConstant; @@ -201,6 +203,13 @@ public class WorkActDraftServiceImpl implements WorkActDraftService { List unitNames = unitIds.stream().map(option::get).collect(Collectors.toList()); actPreviewResultDTO.setUnitIdList(unitIds); actPreviewResultDTO.setUnitNameList(unitNames); + + if (StringUtils.isNotEmpty(actPreviewResultDTO.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(actPreviewResultDTO.getGridId()); + if (null != gridInfo) { + actPreviewResultDTO.setGridName(gridInfo.getGridName()); + } + } } } return actPreviewResultDTO; @@ -337,7 +346,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService { latestActInfoDTO.setActType(formDTO.getActType()); latestActInfoDTO.setTarget(formDTO.getTarget()); - + latestActInfoDTO.setGridId(formDTO.getGridId()); return latestActInfoDTO; } From bf9993c5ead4bf7412c5b6945d53849092ea3603 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 15:54:56 +0800 Subject: [PATCH 18/30] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/CommunitySelfOrganizationListFormDTO.java | 2 ++ .../main/resources/mapper/IcCommunitySelfOrganizationDao.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java index c70e2a7055..5d634afaa3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/CommunitySelfOrganizationListFormDTO.java @@ -46,4 +46,6 @@ public class CommunitySelfOrganizationListFormDTO implements Serializable { private String customerId; private String agencyId; private Integer ranking; + + private String remark; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index 2099c1cce3..0903571a1a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -62,6 +62,9 @@ AND so.ORGANIZATION_NAME LIKE CONCAT('%',#{organizationName},'%') + + AND so.REMARK LIKE CONCAT('%',#{remark},'%') + AND so.ORGANIZATION_CREATED_TIME = ]]> #{startTime} From 6fad1db6817a4bf4d392f34b3da279b78d88f5e3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 15:56:13 +0800 Subject: [PATCH 19/30] s --- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 21a84aa6ad..72b43b0506 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -30,7 +30,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.password.PasswordUtils; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; @@ -741,8 +743,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl()); + AgencyInfoCache agency= CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId()); + resultDTO.setAreaCodePath(null != agency && !CollectionUtils.isEmpty(agency.getAreaCodePath()) ? agency.getAreaCodePath() : new ArrayList<>()); } //获取工作人员所属客户名 CustomerDTO dto = new CustomerDTO(); From d517dec18cc0919da596f34e7cfef7e933551075 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 16:09:13 +0800 Subject: [PATCH 20/30] =?UTF-8?q?tree-ids=CB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuildingServiceImpl.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index d178eb7540..4649e18546 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -297,32 +297,6 @@ public class BuildingServiceImpl implements BuildingService { return result; } result.addAll(customerGridList.stream().map(m -> m.getId()).collect(Collectors.toList())); - List gridList = customerGridList.stream().map(item -> { - BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); - buildingTreeLevelDTO.setId(item.getId()); - buildingTreeLevelDTO.setLabel(item.getGridName()); - buildingTreeLevelDTO.setLevel("grid"); - buildingTreeLevelDTO.setPId(item.getPid()); - buildingTreeLevelDTO.setLongitude(item.getLongitude()); - buildingTreeLevelDTO.setLatitude(item.getLatitude()); - buildingTreeLevelDTO.setChildren(new ArrayList<>()); - //当前网格下有几个小区 - buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR); - return buildingTreeLevelDTO; - }).collect(Collectors.toList()); - - - //3.获取网格下的所有小区 - List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() - .in(IcNeighborHoodEntity::getGridId, gridIdList) - .orderByAsc(IcNeighborHoodEntity::getCreatedTime); - List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); - if(CollectionUtils.isEmpty(icNeighborHoodList)){ - agencyList.addAll(gridList); - return result; - } - result.addAll(icNeighborHoodList.stream().map(m -> m.getId()).collect(Collectors.toList())); return result; } From cb4c343f1c7351b45df1bca21d7f435fee09a276 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 16:30:20 +0800 Subject: [PATCH 21/30] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/attention_vaccination_template.xlsx | Bin 8716 -> 8732 bytes .../mapper/IcEpidemicSpecialAttentionDao.xml | 1 + 2 files changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/attention_vaccination_template.xlsx index 9209a1be459ccec4e0620899bf4032486b1df416..8999a528399b358ceb21053dd6dd22b85aa70df7 100644 GIT binary patch delta 4522 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 Date: Tue, 12 Apr 2022 16:37:18 +0800 Subject: [PATCH 22/30] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=88=B7=E7=B1=8D=E6=89=80=E5=9C=A8=E5=9C=B0=EF=BC=8C=E5=AD=A6?= =?UTF-8?q?=E6=A0=A1=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/IcResiCollectMemFormDTO.java | 10 ++++++++++ .../dto/result/CollectListMemberExcelResultDTO.java | 11 +++++++++++ .../com/epmet/dto/result/CollectListResultDTO.java | 9 +++++++++ .../java/com/epmet/entity/IcResiMemberEntity.java | 9 +++++++++ .../resources/db/migration/V0.0.40__member_huji.sql | 2 ++ .../src/main/resources/mapper/IcResiCollectDao.xml | 4 +++- .../src/main/resources/mapper/IcResiMemberDao.xml | 4 +++- 7 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index 95ae25cd79..12aff48466 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -44,6 +44,16 @@ public class IcResiCollectMemFormDTO implements Serializable { // @NotNull(message = "疫苗接种情况不能为空", groups = {IcResiCollectFormDTO.InternalShowGroup.class, IcResiCollectFormDTO.ExternalShowGroup.class}) private Integer ymjz; + /** + * 户籍所在地 + */ + private String domicilePlace; + + /** + * 学校或公司 + */ + private String workPlace; + /** * 社区居民信息登记-查询返参用 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java index 854d1b3c93..34efe5d146 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java @@ -45,4 +45,15 @@ public class CollectListMemberExcelResultDTO implements Serializable { @Excel(name = "疫苗接种情况",replace = { "全程接种_1", "未全程接种_2", "未接种_0" }, width = 30) private String ymjz; + /** + * 户籍所在地 + */ + @Excel(name = "户籍所在地", width = 60) + private String domicilePlace; + + /** + * 学校或公司 + */ + @Excel(name = "单位或学校", width = 60) + private String workPlace; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index 1d61469165..2b95eb5e04 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -69,6 +69,15 @@ public class CollectListResultDTO implements Serializable { */ private Integer ymjz; + /** + * 户籍所在地 + */ + private String domicilePlace; + + /** + * 学校或公司 + */ + private String workPlace; } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java index 399ce07822..b93190e5c5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -53,4 +53,13 @@ public class IcResiMemberEntity extends BaseEpmetEntity { */ private Integer ymjz; + /** + * 户籍所在地 + */ + private String domicilePlace; + + /** + * 学校或公司 + */ + private String workPlace; } diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql new file mode 100644 index 0000000000..03a2a4bc23 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.40__member_huji.sql @@ -0,0 +1,2 @@ +alter table ic_resi_member add COLUMN DOMICILE_PLACE VARCHAR(128) comment '户籍所在地' AFTER YMJZ; +alter table ic_resi_member add COLUMN WORK_PLACE VARCHAR(128) comment '单位或学校' AFTER DOMICILE_PLACE; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 777622c9f5..28e1e8370a 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -47,7 +47,9 @@ m.ID_NUM AS memberIdNum, m.MOBILE AS memberMobile, m.HE_SUAN_COUNT AS heSuanCount, - m.YMJZ AS ymjz + m.YMJZ AS ymjz, + m.DOMICILE_PLACE as domicilePlace, + m.WORK_PLACE as workPlace from ic_resi_member m where m.DEL_FLAG = 0 and m.IC_RESI_COLLECT_ID = #{id} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml index b76345774c..b9bc9300dd 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml @@ -12,7 +12,9 @@ m.ID_NUM, m.MOBILE, m.HE_SUAN_COUNT, - m.YMJZ + m.YMJZ, + m.DOMICILE_PLACE, + m.WORK_PLACE FROM ic_resi_member m WHERE From 7bd0987bb513f87e0445f0a521306817e46b4cf9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 16:46:54 +0800 Subject: [PATCH 23/30] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPartyActivityDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index ceaae8342e..3d41252510 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -102,6 +102,7 @@ AND TITLE LIKE concat('%', #{title}, '%') AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime} + ORDER BY ACTIVITY_TIME DESC From 82fd9ef3ca54cb4d7bd5a2cb52b7559dbcc26833 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 16:59:16 +0800 Subject: [PATCH 24/30] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPartyActivityDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml index 3d41252510..9bd0824165 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml @@ -49,6 +49,7 @@ + + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 7e376b57ec..af9a7c97c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1298,6 +1298,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl idCards = list.stream().map(m -> m.getIdCard()).distinct().collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(idCards)){ + Result> housesNameByIdCards = govOrgOpenFeignClient.getHousesNameByIdCards(idCards); + if (!housesNameByIdCards.success()){ + throw new EpmetException("查询居民所属房屋失败..."); + } + if (CollectionUtils.isNotEmpty(housesNameByIdCards.getData())){ + list.forEach(l -> housesNameByIdCards.getData().stream().filter( h -> h.getIdCard().equals(l.getIdCard())).forEach(h -> l.setHouseName(h.getHouseName()))); + } + } PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } From 80ea24f36d3f5e3ba90c7be0edbb55dc99310692 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 12 Apr 2022 17:02:53 +0800 Subject: [PATCH 26/30] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.14__activity_add_grid.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql new file mode 100644 index 0000000000..c542430b98 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.14__activity_add_grid.sql @@ -0,0 +1,4 @@ +ALTER TABLE `epmet_heart`.`ic_party_activity` + ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `AGENCY_ID`; +ALTER TABLE `epmet_heart`.`latest_act_info` + ADD COLUMN `GRID_ID` varchar(64) NULL COMMENT '网格ID' AFTER `CUSTOMER_ID`; \ No newline at end of file From ea5cbbb6b22d593e517d1aed350ba6c8b0911e92 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 17:15:02 +0800 Subject: [PATCH 27/30] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E6=9F=A5=E6=88=BF=E5=B1=8B=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index f25f4a14d7..df37d39bf3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -102,6 +102,6 @@ public interface IcHouseDao extends BaseDao { * @author zxc * @date 2022/4/12 16:42 */ - List getHousesNameByIdCards(List idCards); + List getHousesNameByIdCards(@Param("idCards"k) List idCards); } \ No newline at end of file From ed31ffa9c0845444d7a180b1802edc23a7467029 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 17:15:44 +0800 Subject: [PATCH 28/30] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8F=B7=E6=9F=A5=E6=88=BF=E5=B1=8B=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index df37d39bf3..686f2f01b8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -102,6 +102,6 @@ public interface IcHouseDao extends BaseDao { * @author zxc * @date 2022/4/12 16:42 */ - List getHousesNameByIdCards(@Param("idCards"k) List idCards); + List getHousesNameByIdCards(@Param("idCards") List idCards); } \ No newline at end of file From def998c5aef7df3f79fd56c751b7c47f331f7e0f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 12 Apr 2022 17:21:26 +0800 Subject: [PATCH 29/30] dto --- .../dataaggre/dto/govorg/CustomerAgencyDTO.java | 6 ++++++ .../dataaggre/controller/GovOrgController.java | 8 ++++---- .../dataaggre/dao/govorg/CustomerAgencyDao.java | 1 - .../entity/govorg/CustomerAgencyEntity.java | 7 ------- .../dataaggre/service/govorg/GovOrgService.java | 3 +-- .../service/govorg/impl/GovOrgServiceImpl.java | 15 ++++++++------- .../service/impl/AggreGridServiceImpl.java | 5 ++--- .../resources/mapper/govorg/CustomerAgencyDao.xml | 8 -------- 8 files changed, 21 insertions(+), 32 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java index 70c25c839c..1880541692 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerAgencyDTO.java @@ -21,6 +21,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -172,4 +173,9 @@ public class CustomerAgencyDTO implements Serializable { * 联系电话 */ private String mobile; + + /** + * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 + */ + private List areaCodePath; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 717e2370b9..1e560103fa 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -21,10 +21,10 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.beans.GridMemberDataAnalysisExcelExportBean; +import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; -import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums; import com.epmet.dataaggre.service.AggreGridService; import com.epmet.dataaggre.service.govorg.GovOrgService; @@ -242,8 +242,8 @@ public class GovOrgController { * @date 2021/11/5 2:54 下午 */ @PostMapping("agency") - public Result getAgencyInfo(@RequestParam("agencyId")String agencyId){ - return new Result().ok(govOrgService.getAgencyInfo(agencyId)); + public Result getAgencyInfo(@RequestParam("agencyId")String agencyId){ + return new Result().ok(govOrgService.getAgencyInfo(agencyId)); } /** @@ -305,7 +305,7 @@ public class GovOrgController { CustomerGridDTO gridInfo = govOrgService.getGridInfo(orgId); Optional.ofNullable(gridInfo).ifPresent((g) -> orgName.set(g.getGridName())); } else if ("agency".equals(orgType)) { - CustomerAgencyEntity agencyInfo = govOrgService.getAgencyInfo(orgId); + CustomerAgencyDTO agencyInfo = govOrgService.getAgencyInfo(orgId); Optional.ofNullable(agencyInfo).ifPresent((a) -> orgName.set(a.getOrganizationName())); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 8b64711e1f..076b7af7bd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -106,5 +106,4 @@ public interface CustomerAgencyDao extends BaseDao { */ LinkedList subAgencyListAndGridSumNum(@Param("agencyId") String agencyId); - CustomerAgencyEntity selectByAgencyId(@Param("agencyId")String agencyId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java index 28bf2d90a8..171e01198f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerAgencyEntity.java @@ -22,8 +22,6 @@ import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.List; - /** * 机关单位信息表 * @@ -76,11 +74,6 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { */ private String areaCode; - /** - * 地区编码全路径：例如：37,3702,370203,370203005,370203005015 - */ - private List areaCodePath; - /** * 总人数 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 53c1f3200c..6b5d2d0ed4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -8,7 +8,6 @@ import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; -import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -162,7 +161,7 @@ public interface GovOrgService { * @author zxc * @date 2021/11/5 2:54 下午 */ - CustomerAgencyEntity getAgencyInfo(String agencyId); + CustomerAgencyDTO getAgencyInfo(String agencyId); /** * @Description 查询网格信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 0b6944ce68..992ac08201 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; @@ -608,17 +609,17 @@ public class GovOrgServiceImpl implements GovOrgService { * @date 2021/11/5 2:54 下午 */ @Override - public CustomerAgencyEntity getAgencyInfo(String agencyId) { - CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectByAgencyId(agencyId); + public CustomerAgencyDTO getAgencyInfo(String agencyId) { + CustomerAgencyEntity customerAgencyEntity=customerAgencyDao.selectById(agencyId); + CustomerAgencyDTO res= ConvertUtils.sourceToTarget(customerAgencyEntity,CustomerAgencyDTO.class); //设置行政地区编码全路径 - if (StringUtils.isNotBlank(customerAgencyEntity.getAreaCode()) && StringUtils.isNotBlank(customerAgencyEntity.getParentAreaCode())) { - customerAgencyEntity.setAreaCodePath(queryAreaCodePath(customerAgencyEntity)); + if (StringUtils.isNotBlank(res.getAreaCode()) && StringUtils.isNotBlank(res.getParentAreaCode())) { + res.setAreaCodePath(queryAreaCodePath(res)); } - - return customerAgencyEntity; + return res; } - private List queryAreaCodePath(CustomerAgencyEntity customerAgencyEntity) { + private List queryAreaCodePath(CustomerAgencyDTO customerAgencyEntity) { List areaCodePath = new ArrayList<>(); switch (customerAgencyEntity.getLevel()) { case Constant.COMMUNITY: diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java index 972d686151..d9804c5b1c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java @@ -8,10 +8,10 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dataaggre.dto.epmetuser.result.StaffPatrolRecordDailyResultDTO; +import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; -import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.service.AggreGridService; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; @@ -22,7 +22,6 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import sun.rmi.runtime.Log; import java.util.*; @@ -173,7 +172,7 @@ public class AggreGridServiceImpl implements AggreGridService { * @return */ private String getPidsByAgencyId(String agencyId) { - CustomerAgencyEntity agencyInfo = govOrgService.getAgencyInfo(agencyId); + CustomerAgencyDTO agencyInfo = govOrgService.getAgencyInfo(agencyId); if (agencyInfo == null) { String errorMsg = "【网格员数据统计查询pcwork】查询组织信息返回为null"; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index 9e654e9bec..e5594fdb5e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -299,12 +299,4 @@ ORDER BY created_time ASC - From 2894a5dfd79d325e61091c72718f1e49454fefa6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Apr 2022 17:33:57 +0800 Subject: [PATCH 30/30] =?UTF-8?q?sql=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index d067b0801b..19e99c1eff 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -170,7 +170,7 @@ a.BUILDING_UNIT_ID as unitNumKey, a.HOUSE_TYPE as houseTypeKey, a.PURPOSE as purposeKey, - a.RENT_FLAG as rentFlagKey, + CAST(a.RENT_FLAG AS CHAR) as rentFlagKey, c.AGENCY_ID as agencyId, c.GRID_ID as gridId from ic_house a