From 0b2438ac41da14821e6a51af888d8785bde024fd Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 10:00:46 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/PatrolRoutineWorkFormDTO.java | 8 ++++++-- .../java/com/epmet/entity/PatrolRoutineWorkEntity.java | 10 ++++++++++ .../service/impl/PatrolRoutineWorkServiceImpl.java | 6 ++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java index 520e04d105..942eae1b44 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java @@ -50,9 +50,13 @@ public class PatrolRoutineWorkFormDTO implements Serializable { private String address; /** - * 基础信息ID【相关信息】暂时没有 + * 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地 */ - private String baseInfoId; + private String isKeyPeopleLocate; + /** + * 重点人员现状 + */ + private String keyPeopleStatus; /** * 经度 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java index 94bde0e1ba..d8870a9430 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java @@ -75,6 +75,16 @@ public class PatrolRoutineWorkEntity extends BaseEpmetEntity { */ private String workContent; + /** + * 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地 + */ + private String isKeyPeopleLocate; + + /** + * 重点人员现状 + */ + private String keyPeopleStatus; + /** * 经度 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index 91e2c520df..ff8c48acbe 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.PatrolRoutineWorkService; import com.epmet.service.PatrolRoutineWorkTypeService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -76,6 +77,11 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl Date: Fri, 24 Dec 2021 10:02:22 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=AD=97=E6=AE=B5=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.21__user_routine_work_2.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.21__user_routine_work_2.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.21__user_routine_work_2.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.21__user_routine_work_2.sql new file mode 100644 index 0000000000..9ee5c043fe --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.21__user_routine_work_2.sql @@ -0,0 +1,3 @@ +ALTER TABLE `epmet_user`.`patrol_routine_work` + ADD COLUMN `IS_KEY_PEOPLE_LOCATE` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '重点人员是否在当地-当事件类型为【特殊人群服务与管理】时必填' AFTER `WORK_CONTENT`, + ADD COLUMN `KEY_PEOPLE_STATUS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '重点人员现状' AFTER `IS_KEYPEOPLE_LOCATE`; From 251325d9a718f71c3f0c376c03cbf3ec5713d634 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 10:05:46 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java | 3 ++- .../main/java/com/epmet/entity/PatrolRoutineWorkEntity.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java index 942eae1b44..ada4f7bf42 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java @@ -52,7 +52,8 @@ public class PatrolRoutineWorkFormDTO implements Serializable { /** * 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地 */ - private String isKeyPeopleLocate; + @Range(min = 0, max = 1, message = "重点人员是否在当地格式错误", groups = AddOrUpdateForm.class) + private Integer isKeyPeopleLocate; /** * 重点人员现状 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java index d8870a9430..200462b914 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/PatrolRoutineWorkEntity.java @@ -78,7 +78,7 @@ public class PatrolRoutineWorkEntity extends BaseEpmetEntity { /** * 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地 */ - private String isKeyPeopleLocate; + private Integer isKeyPeopleLocate; /** * 重点人员现状 From 244b6552e1d46df4ed5254508957e1bde2115d79 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 10:09:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index ff8c48acbe..fba74fcbce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -78,7 +78,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl Date: Fri, 24 Dec 2021 10:21:24 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.21__user_routine_work_2.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.21__user_routine_work_2.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.21__user_routine_work_2.sql index 9ee5c043fe..69506c5d8d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.21__user_routine_work_2.sql +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.21__user_routine_work_2.sql @@ -1,3 +1,3 @@ ALTER TABLE `epmet_user`.`patrol_routine_work` ADD COLUMN `IS_KEY_PEOPLE_LOCATE` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '重点人员是否在当地-当事件类型为【特殊人群服务与管理】时必填' AFTER `WORK_CONTENT`, - ADD COLUMN `KEY_PEOPLE_STATUS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '重点人员现状' AFTER `IS_KEYPEOPLE_LOCATE`; + ADD COLUMN `KEY_PEOPLE_STATUS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '重点人员现状' AFTER `IS_KEY_PEOPLE_LOCATE`; From d32f970d950f891d92fc6c6a06d9b1d5bfb41db4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 10:33:41 +0800 Subject: [PATCH 6/6] 12312312 --- .../java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java | 2 +- .../epmet/service/impl/PatrolRoutineWorkServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java index ada4f7bf42..5a9f6d63e5 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java @@ -55,7 +55,7 @@ public class PatrolRoutineWorkFormDTO implements Serializable { @Range(min = 0, max = 1, message = "重点人员是否在当地格式错误", groups = AddOrUpdateForm.class) private Integer isKeyPeopleLocate; /** - * 重点人员现状 + * 当事件类型为【特殊人群服务与管理】时必填 重点人员现状 */ private String keyPeopleStatus; /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index fba74fcbce..61bb3d0e39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -116,7 +116,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl 0) { + } else if (pidSb.indexOf(pid) == NumConstant.ONE_NEG) { + if (pidSb.length() > NumConstant.ZERO) { pidSb.append(StrConstant.COLON); } pidSb.append(pid);