12312312

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;
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

@@ -116,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);
@@ -137,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);