2025-06-06

同意时且是非会签节点是，node_conclusion没有全部反刷

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);
         }
         // =========================

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}