From ab5cd491d6dc1f8c463e39f8f4adb081c651c382 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Thu, 4 Sep 2025 22:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ai=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HseViolationRecordCreateHandlerReq.java   |  9 ++---
 .../impl/HseViolationRecordServiceImpl.java   | 34 ++++++++++++++-----
 2 files changed, 30 insertions(+), 13 deletions(-)

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<HseViolationRecor
         if (oldViolationRecord == null) {
             throw new ServiceException("违规记录信息不存在", HttpStatus.NOT_FOUND);
         }
-        Long correctorId = req.getCorrectorId();
-        SysUserVo user = userService.selectUserById(correctorId);
-        if (user == null) {
-            throw new ServiceException("处理人信息不存在", HttpStatus.NOT_FOUND);
-        }
+        String processType = req.getProcessType();
         HseViolationRecord violationRecord = new HseViolationRecord();
-        violationRecord.setId(id);
-        violationRecord.setCorrectorId(correctorId);
-        violationRecord.setDisposeDeadline(req.getDisposeDeadline());
-        violationRecord.setRemark(req.getRemark());
+        if (Objects.equals(processType, "0")) {
+            // 仅通知
+            violationRecord.setProcessType(processType);
+        } else if (Objects.equals(processType, "1")) {
+            // 判断字段是否为空
+            if (StringUtils.isBlank(req.getRectificationUnit()) || req.getRectificationId() == null) {
+                throw new ServiceException("整改单位信息不能为空", HttpStatus.BAD_REQUEST);
+            }
+            LocalDate disposeDeadline = req.getDisposeDeadline();
+            if (disposeDeadline == null || disposeDeadline.isBefore(LocalDate.now())) {
+                throw new ServiceException("整改期限不能小于当前时间", HttpStatus.BAD_REQUEST);
+            }
+            // 整改
+            Long correctorId = req.getCorrectorId();
+            SysUserVo user = userService.selectUserById(correctorId);
+            if (user == null) {
+                throw new ServiceException("处理人信息不存在", HttpStatus.NOT_FOUND);
+            }
+            violationRecord.setId(id);
+            violationRecord.setCorrectorId(correctorId);
+            violationRecord.setDisposeDeadline(disposeDeadline);
+            violationRecord.setProcessType(processType);
+            violationRecord.setRemark(req.getRemark());
+        }
         boolean result = this.updateById(violationRecord);
         if (!result) {
             throw new ServiceException("更新处理人操作失败", HttpStatus.ERROR);