diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationrecord/HseViolationRecordCreateHandlerReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationrecord/HseViolationRecordCreateHandlerReq.java index b18e766e..b22ad91d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationrecord/HseViolationRecordCreateHandlerReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationrecord/HseViolationRecordCreateHandlerReq.java @@ -28,13 +28,11 @@ public class HseViolationRecordCreateHandlerReq implements Serializable { /** * 整改单位(1分包 2班组) */ - @NotBlank(message = "整改单位为空") private String rectificationUnit; /** * 整改单位id */ - @NotNull(message = "整改单位id不能为空") private Long rectificationId; /** @@ -45,10 +43,13 @@ public class HseViolationRecordCreateHandlerReq implements Serializable { /** * 处理期限 */ - @NotNull(message = "处理期限不能为空") - @Future(message = "处理期限不能小于当前时间") private LocalDate disposeDeadline; + /** + * 是否回复 + */ + private String processType; + /** * 备注 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java index 170d27cf..6401ff8c 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java @@ -222,16 +222,32 @@ public class HseViolationRecordServiceImpl extends ServiceImpl