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