From bf8321e225387274c3a4c4ec92ef73e3412b5181 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Jun 2022 09:16:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcCommunitySelfOrganizationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java index 3855b270e2..195343850e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java @@ -605,7 +605,7 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl> groupByPhone = persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)); + Map> groupByPhone = CollectionUtils.isNotEmpty(persons) ? persons.stream().collect(Collectors.groupingBy(IcCommunitySelfOrganizationPersonnelEntity::getPersonPhone)) : new HashMap<>(); List phones = new ArrayList<>(); groupByPhone.forEach((k,v) -> { if (v.size() > NumConstant.ONE){ From dd4b8b7fce011c1db78beebfe578fbc05bf565a1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Jun 2022 09:32:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87address?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/AddCommunitySelfOrganizationFormDTO.java | 5 +++++ .../epmet/dto/form/EditCommunitySelfOrganizationFormDTO.java | 5 +++++ .../epmet/dto/result/CommunitySelfOrganizationListDTO.java | 5 +++++ .../com/epmet/entity/IcCommunitySelfOrganizationEntity.java | 5 +++++ .../main/resources/db/migration/V0.0.21__selforg_address.sql | 1 + .../main/resources/mapper/IcCommunitySelfOrganizationDao.xml | 1 + 6 files changed, 22 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.21__selforg_address.sql 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 29a338232f..2e4b8fb8b8 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 @@ -77,6 +77,11 @@ public class AddCommunitySelfOrganizationFormDTO implements Serializable { */ private String latitude; + /** + * 地址 + */ + private String address; + /** * 社区自组织人员 */ 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 6c8eb94baa..f70bd26d18 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 @@ -72,6 +72,11 @@ public class EditCommunitySelfOrganizationFormDTO implements Serializable { */ private String latitude; + /** + * 地址 + */ + private String address; + /** * 备注 */ 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 331fbf3413..39552f7654 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 @@ -87,6 +87,11 @@ public class CommunitySelfOrganizationListDTO implements Serializable { */ private String latitude; + /** + * 地址 + */ + private String address; + /** * 社区自组织ID */ 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 0268a247fb..7098ce83e9 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 @@ -107,6 +107,11 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 地址 + */ + private String address; + /** * 备注 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.21__selforg_address.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.21__selforg_address.sql new file mode 100644 index 0000000000..6211347e76 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.21__selforg_address.sql @@ -0,0 +1 @@ +alter TABLE ic_community_self_organization add COLUMN ADDRESS VARCHAR(256) COMMENT '地址' AFTER LATITUDE; \ 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 c6e34a86fa..e16146e827 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 @@ -60,6 +60,7 @@ so.SERVICE_ITEM AS serviceItem, so.LONGITUDE AS longitude, so.LATITUDE AS latitude, + so.ADDRESS as address, so.ID as orgId, so.remark FROM ic_community_self_organization so From 0875fd93dbdf0dcfcda7ff8b86c7d8611ff9623f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Jun 2022 09:47:52 +0800 Subject: [PATCH 3/3] update --- .../main/resources/mapper/IcCommunitySelfOrganizationDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e16146e827..fd457a3628 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 @@ -17,7 +17,8 @@ REMARK = #{remark}, UPDATED_TIME = NOW(), UPDATED_BY = #{updatedBy}, - CATEGORY_CODE =#{categoryCode} + CATEGORY_CODE =#{categoryCode}, + ADDRESS = #{address} WHERE DEL_FLAG = 0 AND ID = #{orgId}