From 933f266ec3748bd41f38cfeb3124a3a44ad7b78b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 12 Jun 2025 18:00:15 +0800
Subject: [PATCH] 2025-06-12

---
 .../spring/modules/request/mapper/RequestManageMapper.java | 2 ++
 .../request/service/impl/RequestManageServiceImpl.java     | 7 ++++++-
 src/main/resources/mapper/request/RequestManageMapper.xml  | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java b/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java
index 70ff5cc6..94ff132c 100644
--- a/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java
+++ b/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java
@@ -176,4 +176,6 @@ public interface RequestManageMapper extends BaseMapper<PlmRequestHeaderEntity>
     List<ProcessFormVo> getProcessFlowInformation2(@Param("site") String site, @Param("workflowId") String workflowId, @Param("documentNo") String documentNo, @Param("workflowName") String workflowName,
                                                    @Param("nodeId") String nodeId, @Param("nodeName") String nodeName, @Param("createBy") String createBy, @Param("updateBy") String updateBy,
                                                    @Param("documentType") String documentType, @Param("documentStatus") String documentStatus, @Param("page") int page, @Param("limit") int limit);
+
+    void updateProcessInterventionFlag2(ProcessFormVo inData);
 }
diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
index 78e5d7fe..3e429dae 100644
--- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
+++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
@@ -434,7 +434,12 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
             // 更新PLM的节点状态、节点
             // 修改原节点的流程干预标识为Y
             inData.setProcessInterventionFlag("Y");
-            requestManageMapper.updateProcessInterventionFlag(inData);
+            if ("update".equals(data.getProcessFlag())) {
+                requestManageMapper.updateProcessInterventionFlag(inData);
+            } else {
+                requestManageMapper.updateProcessInterventionFlag2(inData);
+            }
+
             // 修改上一个节点的isRemark为0
             for (ProcessFormVo processFormVo : previousProcessList) {
                 requestManageMapper.updateIsRemarkToZero(processFormVo.getId());
diff --git a/src/main/resources/mapper/request/RequestManageMapper.xml b/src/main/resources/mapper/request/RequestManageMapper.xml
index b2a107db..4d0e92a1 100644
--- a/src/main/resources/mapper/request/RequestManageMapper.xml
+++ b/src/main/resources/mapper/request/RequestManageMapper.xml
@@ -459,6 +459,12 @@
     </select>
 
     <update id="updateProcessInterventionFlag" parameterType="com.spring.modules.change.vo.ProcessFormVo">
+        update plm_process_form
+        set process_intervention_flag = #{processInterventionFlag}
+        where site = #{site} and document_no = #{documentNo} and request_id = #{requestId} and node_id = #{nodeId} and is_remark = 0
+    </update>
+
+    <update id="updateProcessInterventionFlag2" parameterType="com.spring.modules.change.vo.ProcessFormVo">
         update plm_process_form
         set process_intervention_flag = #{processInterventionFlag},
             is_remark = 1