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 1/5] 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 2/5] =?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 3/5] =?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 4/5] =?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 5/5] =?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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