From af55c87e042090303d7eba076e53c0b2dae6a99f Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 21 Oct 2024 17:54:20 +0800
Subject: [PATCH] =?UTF-8?q?2024-10-21=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/change/mapper/ChangeManagementMapper.java |  2 ++
 .../service/impl/ChangeManagementServiceImpl.java     |  8 ++++++++
 .../mapper/change/ChangeManagementMapper.xml          | 11 ++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
index cbc1ebf4..a175ca33 100644
--- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
+++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
@@ -167,4 +167,6 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
     List<PlmRequestDetailVo> getReviewByNodeId(@Param("site") String site, @Param("classificationNo") String classificationNo, @Param("workflowId") String workflowId, @Param("reviewNodeId") String reviewNodeId);
 
     List<TechnicalSpecificationData> technicalSpecificationSearch2(TechnicalSpecificationData data);
+
+    void updateProcessFormToAgree(ParamData paramData);
 }
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 f8bd494c..36d2b2e2 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
@@ -1257,6 +1257,10 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 throw new RuntimeException("统一待办异常信息：" + receiveRequestInfoResponse.getMsg());
             }
         }
+
+        // 将第一个节点记录修改为同意
+        paramData.setStepId(10);
+        changeManagementMapper.updateProcessFormToAgree(paramData);
     }
 
     /**
@@ -1638,6 +1642,10 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             List<PlmRequestDetailVo> nodeDetailLast = changeManagementMapper.queryNodeDetailLast(paramData.getSite(), paramData.getClassificationNo(), paramData.getWorkflowId());
             paramData.setStepId(nodeDetailLast.get(0).getStepId());
             changeManagementMapper.updateChangeStatus2(paramData);
+
+            // 修改最后一个节点为同意
+            changeManagementMapper.updateProcessFormToAgree(paramData);
+
             // 如果是ECN则执行升版操作
             if ("ECN".equals(type)) {
                 ChangeRequestEntity changeRequestEntity = new ChangeRequestEntity();
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index 4f2b5c2c..7c883048 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -1070,7 +1070,9 @@
             case when c.node_conclusion = 'Y' then '同意' when c.node_conclusion = 'N' then '驳回' else '' end as nodeConclusionDesc,
             c.create_date,
             c.create_by,
-            c.reject_opinion
+            c.reject_opinion,
+            c.update_date,
+            c.update_by
         from plm_request_header a
         LEFT JOIN plm_request_node b ON a.SITE = b.SITE AND a.classification_no = b.classification_no AND a.workflow_id = b.workflow_id
         LEFT JOIN plm_process_form c ON b.SITE = b.SITE AND b.classification_no = c.classification_no AND b.workflow_id = c.workflow_id AND b.node_id = c.node_id and c.document_no = #{documentNo}
@@ -1138,4 +1140,11 @@
         AND workflow_id = #{workflowId}
         AND node_id = #{reviewNodeId}
     </select>
+
+    <!-- 编辑变更单属性 -->
+    <update id="updateProcessFormToAgree">
+        update plm_process_form
+        set node_conclusion = 'Y'
+        where site = #{site} and bu = #{bu} and menu_id = #{menuId} and document_no = #{docNo} and step_id = #{stepId}
+    </update>
 </mapper>