From 4471babe474a0dddcd075e13be29411848ce17ec Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 6 Jun 2025 09:09:28 +0800
Subject: [PATCH] =?UTF-8?q?2025-06-06=20=E5=90=8C=E6=84=8F=E6=97=B6?=
 =?UTF-8?q?=E4=B8=94=E6=98=AF=E9=9D=9E=E4=BC=9A=E7=AD=BE=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=98=AF=EF=BC=8Cnode=5Fconclusion=E6=B2=A1=E6=9C=89=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E5=8F=8D=E5=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../change/service/impl/ChangeManagementServiceImpl.java   | 7 ++++---
 .../resources/mapper/change/ChangeManagementMapper.xml     | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
index ad43eaee..29800c28 100644
--- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
+++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
@@ -1404,9 +1404,6 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         // 查 processForm 表 isRemark = 0 的信息
         List<ProcessFormVo> pfs = changeManagementMapper.getProcessFormByIsRemark(paramData.getSite(), paramData.getBu(), paramData.getDocNo(), "0");
 
-        // 修改单据的节点结论和驳回意见
-        // 2025-05-30 会签节点时，其中一个人驳回就算驳回 同意的话不变 sql和驳回分开
-        changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion(), paramData.getDomainControlAccount());
         // 2025-05-12 使用 process_form 根据 site documentNo isRemark = 0 来获取人员 可能有多个 循环调用
         DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam();
         deleteUserRequestInfoParam.setRequestId(paramData.getWorkflowId() + paramData.getRequestId());
@@ -1418,9 +1415,13 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         PlmRequestDetailVo requestNode = changeManagementMapper.getRequestNodeByNodeId(paramData.getSite(), paramData.getClassificationNo(), paramData.getNodeId());
         // 非会签
         if (requestNode.getCountersignatureItem() != null && "1".equals(requestNode.getCountersignatureItem())) {
+            // 修改单据的节点结论和驳回意见
+            changeManagementMapper.updateProcessNodeForReject(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion());
             changeManagementMapper.updateProcessForm3(paramData);
         } else {
             // 2025-05-30 会签节点时，其中一个人驳回就算驳回 但同意的话不变 sql和驳回分开
+            // 修改单据的节点结论和驳回意见
+            changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion(), paramData.getDomainControlAccount());
             changeManagementMapper.updateProcessForm2(paramData);
         }
         // =========================
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 75ee76c9..5ace0c7b 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -1093,7 +1093,6 @@
         where site = #{site} and document_no = #{docNo} and is_remark = 0
     </update>
 
-
     <!-- 编辑变更单属性 -->
     <update id="updateChangeStatus2" parameterType="ParamData">
         update ${tableName}