From b5c5d329377c63a39c7a3e365aeb8e01e3763d67 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 11 Aug 2020 15:48:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../epmet/service/impl/CustomerAgencyServiceImpl.java | 11 ++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index b643b6a136..4669299d44 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.81 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.82 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index d431df354c..64cfad94f0 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.81 + 0.3.82 com.epmet gov-org diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 9e059be1bc..69a1d4ec87 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -581,11 +581,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyIdList = new ArrayList<>(); if (args.length < NumConstant.ONE) { processorList.setParentAgencyList(parentAgencyList); @@ -597,7 +594,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl parentList = baseDao.selectAgencyListByIds(agencyIdList); - parentList.forEach(parent -> { + parentList.forEach(parent->{ AgencyResultDTO agency = new AgencyResultDTO(); agency.setAgencyId(parent.getId()); agency.setAgencyName(parent.getOrganizationName()); @@ -606,7 +603,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : ":") + entity.getId()); + List subAgencyList = getDepartmentList(entity.getPids() + ":" + entity.getId()); processorList.setSubAgencyList(subAgencyList); return processorList; From b076049c3c757f4fc281461f3a0a2e394a29b43b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 11 Aug 2020 15:51:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9volunteer=5Finfo=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.3__addgridIdAndgridName.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.3__addgridIdAndgridName.sql diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.3__addgridIdAndgridName.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.3__addgridIdAndgridName.sql new file mode 100644 index 0000000000..8e93f7dbbc --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.3__addgridIdAndgridName.sql @@ -0,0 +1 @@ +ALTER TABLE volunteer_info ADD ( GRID_ID VARCHAR ( 64 ) NOT NULL COMMENT '网格id', GRID_NAME VARCHAR ( 256 ) NOT NULL COMMENT '网格名称' ); \ No newline at end of file From 2d6825338ce1a103acc80c737170295a4f405c1f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 11 Aug 2020 15:53:49 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E9=A1=B6=E7=BA=A7=E7=BB=84=E7=BB=87=E4=B8=8D=E8=83=BD=E5=BE=80?= =?UTF-8?q?=E4=B8=8B=E8=BD=ACbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/CustomerAgencyServiceImpl.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 69a1d4ec87..e399d29b85 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -581,8 +581,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyIdList = new ArrayList<>(); if (args.length < NumConstant.ONE) { processorList.setParentAgencyList(parentAgencyList); @@ -594,7 +597,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl parentList = baseDao.selectAgencyListByIds(agencyIdList); - parentList.forEach(parent->{ + parentList.forEach(parent -> { AgencyResultDTO agency = new AgencyResultDTO(); agency.setAgencyId(parent.getId()); agency.setAgencyName(parent.getOrganizationName()); @@ -603,7 +606,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl subAgencyList = getDepartmentList(entity.getPids() + ":" + entity.getId()); + List subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : entity.getPids() + ":") + entity.getId()); processorList.setSubAgencyList(subAgencyList); return processorList; From 98759cd9012a7ca7100bb4931b8428279c4c31fb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 11 Aug 2020 15:58:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?master=5Fbugfix=E5=88=86=E6=94=AF=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=88=B0dev=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 4669299d44..c8e1e6f1eb 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.82 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.83 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 64cfad94f0..bff2680d39 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.82 + 0.3.83 com.epmet gov-org From a44a04fca76a7998d66e2d6b662804e54cd3a940 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 11 Aug 2020 16:14:41 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E3=80=81?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E7=BD=91=E6=A0=BCid=E3=80=81=E7=BD=91=E6=A0=BC=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/VolunteerInfoDTO.java | 11 ++++++++++- .../form/resi/ResiVolunteerAuthenticateFormDTO.java | 12 ++++++++++++ .../dto/result/resi/ResiVolunteerInfoResultDTO.java | 10 ++++++++++ .../java/com/epmet/entity/VolunteerInfoEntity.java | 9 +++++++++ .../epmet/service/impl/VolunteerInfoServiceImpl.java | 2 ++ .../src/main/resources/mapper/VolunteerInfoDao.xml | 12 +++++++++++- 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/VolunteerInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/VolunteerInfoDTO.java index e0f352bc70..b309d9a7d5 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/VolunteerInfoDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/VolunteerInfoDTO.java @@ -88,4 +88,13 @@ public class VolunteerInfoDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 志愿者注册，所在网格ID + */ + private String gridId; + + /** + * 志愿者注册，所在网格名称 + */ + private String gridName; +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java index be0ea43393..0a42ede194 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiVolunteerAuthenticateFormDTO.java @@ -120,4 +120,16 @@ public class ResiVolunteerAuthenticateFormDTO implements Serializable { * 移动端决定是否上送验证码。 */ private String smsCode; + + /** + * 志愿者注册，所在网格ID + */ + @NotBlank(message = "志愿者注册，所在网格ID不能为空", groups = {AddUserShowGroup.class }) + private String gridId; + + /** + * 志愿者注册，所在网格名称 + */ + @NotBlank(message = "志愿者注册，所在网格名称不能为空", groups = {AddUserShowGroup.class }) + private String gridName; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java index 20995ac5a4..8cf97d826c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiVolunteerInfoResultDTO.java @@ -83,4 +83,14 @@ public class ResiVolunteerInfoResultDTO implements Serializable { * 志愿者自我介绍 */ private String volunteerIntroduce; + + /** + * 志愿者注册，所在网格ID + */ + private String gridId; + + /** + * 志愿者注册，所在网格名称 + */ + private String gridName; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java index 484e911fe1..fcce38bc75 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java @@ -58,4 +58,13 @@ public class VolunteerInfoEntity extends BaseEpmetEntity { */ private String volunteerSignature; + /** + * 志愿者注册，所在网格ID + */ + private String gridId; + + /** + * 志愿者注册，所在网格名称 + */ + private String gridName; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index e9c52e460f..05e31890dc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -151,6 +151,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl + + @@ -40,6 +42,12 @@ UPDATED_BY = #{userId}, + + GRID_ID = #{gridId}, + + + GRID_NAME = #{gridName}, + UPDATED_TIME = now() WHERE DEL_FLAG = '0' AND USER_ID = #{userId} @@ -49,7 +57,9 @@ SELECT CUSTOMER_ID customerId, VOLUNTEER_INTRODUCE volunteerIntroduce, - VOLUNTEER_SIGNATURE volunteerSignature + VOLUNTEER_SIGNATURE volunteerSignature, + GRID_ID gridId, + GRID_NAME gridName FROM volunteer_info WHERE DEL_FLAG = '0' AND USER_ID = #{userId} From a28fa3418450e5a9df1d3ff9505762c8fa33ce59 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 11 Aug 2020 16:42:51 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=20=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/VolunteerInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index 05e31890dc..7357735fab 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -151,8 +151,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl Date: Tue, 11 Aug 2020 16:56:27 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E8=B5=8B=E5=80=BC=E5=A4=84=E7=90=86-?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=8E=86=E5=8F=B2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/VolunteerInfoServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index 7357735fab..3f4574cacd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -151,8 +151,9 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl Date: Tue, 11 Aug 2020 17:19:02 +0800 Subject: [PATCH 8/8] heart47 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index b9f1b64377..bef16fbcd9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.46 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.47 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index da837d96d1..c027771de8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.46 + 0.0.47 com.epmet epmet-heart