From 0b2438ac41da14821e6a51af888d8785bde024fd Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 24 Dec 2021 10:00:46 +0800
Subject: [PATCH 1/2] =?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<PatrolRoutineW
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(PatrolRoutineWorkFormDTO formDTO) {
+        if (formDTO.getWorkTypeList().toString().contains("02")
+                && (StringUtils.isBlank(formDTO.getIsKeyPeopleLocate()) || StringUtils.isBlank(formDTO.getKeyPeopleStatus()))){
+            log.warn("add patrolRoutineWork fail,param is error,param:{}", JSON.toJSONString(formDTO));
+            throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode());
+        }
         PatrolRoutineWorkEntity entity = ConvertUtils.sourceToTarget(formDTO, PatrolRoutineWorkEntity.class);
 
         CustomerGridFormDTO gridFormDTO = new CustomerGridFormDTO();

From b40a1f20dde71888112dd4aba6743cdbe7f631aa Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 24 Dec 2021 10:02:22 +0800
Subject: [PATCH 2/2] =?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`;