From 7b1bb7537b53c44d7111f7a656fcb88ed19fe2dc Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Wed, 15 Apr 2026 18:31:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=B6=89=E8=AE=BF?=
 =?UTF-8?q?=E6=B6=89=E8=AF=89=E6=B5=81=E7=A8=8B=E5=88=9D=E6=A0=B8=E5=8A=9E?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biutag/supervision/constants/enums/FlowActionEnum.java   | 2 ++
 src/main/java/com/biutag/supervision/flow/FlowService.java   | 5 +++++
 .../supervision/flow/action/ApplyCompletionAction.java       | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/constants/enums/FlowActionEnum.java b/src/main/java/com/biutag/supervision/constants/enums/FlowActionEnum.java
index f8af85c..c589499 100644
--- a/src/main/java/com/biutag/supervision/constants/enums/FlowActionEnum.java
+++ b/src/main/java/com/biutag/supervision/constants/enums/FlowActionEnum.java
@@ -7,6 +7,8 @@ import lombok.Getter;
 public enum FlowActionEnum {
 
     FIRST_DISTRIBUTE("first_distribute", "已下发"),
+
+    SAVE("save", "保存"),
     SECOND_APPROVE("second_approve", "已审批"),
     FIRST_APPROVE("first_approve", "已审批");
 
diff --git a/src/main/java/com/biutag/supervision/flow/FlowService.java b/src/main/java/com/biutag/supervision/flow/FlowService.java
index efa9c64..9a840e5 100644
--- a/src/main/java/com/biutag/supervision/flow/FlowService.java
+++ b/src/main/java/com/biutag/supervision/flow/FlowService.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.biutag.supervision.common.UserContextHolder;
+import com.biutag.supervision.constants.enums.FlowActionEnum;
 import com.biutag.supervision.flow.action.Action;
 import com.biutag.supervision.pojo.dto.ActionDto;
 import com.biutag.supervision.pojo.entity.Negative;
@@ -57,6 +58,10 @@ public class FlowService {
                 );
             }
         }
+        // 保存操作不保留操作流程历史
+        if (FlowActionEnum.SAVE.getKey().equals(actionDto.getActionKey())) {
+            return true;
+        }
         NegativeWork work = workService.getById(actionDto.getWorkId());
 
         NegativeHistory history = new NegativeHistory().setHistoryId(IdUtil.fastSimpleUUID())
diff --git a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java
index 8343e0f..97994b5 100644
--- a/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java
+++ b/src/main/java/com/biutag/supervision/flow/action/ApplyCompletionAction.java
@@ -79,11 +79,12 @@ public class ApplyCompletionAction implements Action {
                 .set(Negative::getVerifyTime, LocalDateTime.now())
                 .set(Negative::getLatestProcessTime, LocalDateTime.now());
         negativeService.update(updateWrapper);
-        // 同步修改投诉举报涉及单位
-        updateComplaintCollectionInfo(negative, verifyData);
     }
 
     public void updateNegative(Negative negative, VerifyData verifyData) {
+        // 同步修改投诉举报涉及单位
+        updateComplaintCollectionInfo(negative, verifyData);
+
         LocalDateTime now = LocalDateTime.now();
         String checkStatus = null;
         if (CheckStatusEnum.TRUE.getValue().equals(verifyData.getCheckStatusCode())) {