Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into dev

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PatrolRoutineWorkFormDTO.java

@@ -50,9 +50,14 @@ public class PatrolRoutineWorkFormDTO implements Serializable {
     private String address;
 
     /**
-     * 基础信息ID【相关信息】暂时没有
+     * 当事件类型为【特殊人群服务与管理】时必填 重点人员是否在当地
      */
-    private String baseInfoId;
+    @Range(min = 0, max = 1, message = "重点人员是否在当地格式错误", groups = AddOrUpdateForm.class)
+    private Integer isKeyPeopleLocate;
+    /**
+     * 当事件类型为【特殊人群服务与管理】时必填 重点人员现状
+     */
+    private String keyPeopleStatus;
     /**
      * 经度
      */

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 Integer isKeyPeopleLocate;
+
+	/**
+	 * 重点人员现状
+	 */
+	private String keyPeopleStatus;
+
     /**
      * 经度
      */

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")
+                && (formDTO.getIsKeyPeopleLocate() == null || 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();
@@ -110,7 +116,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
             typeEntity.setRoutineWorkId(entity.getId());
             typeEntity.setWorkTypeCode(code);
             StringBuilder pids = pidsMap.get(code);
-            typeEntity.setAllPCode(pids.length() == 0 ? NumConstant.ZERO_STR : pids.toString());
+            typeEntity.setAllPCode(pids.length() == NumConstant.ZERO ? NumConstant.ZERO_STR : pids.toString());
             workTypeList.add(typeEntity);
         });
         patrolRoutineWorkTypeService.insertBatch(workTypeList);
@@ -131,8 +137,8 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
         StringBuilder pidSb = result.get(pid);
         if (pidSb == null) {
             pidSb = new StringBuilder();
-        } else if (pidSb.indexOf(pid) == -1) {
-            if (pidSb.length() > 0) {
+        } else if (pidSb.indexOf(pid) == NumConstant.ONE_NEG) {
+            if (pidSb.length() > NumConstant.ZERO) {
                 pidSb.append(StrConstant.COLON);
             }
             pidSb.append(pid);

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_KEY_PEOPLE_LOCATE`;