From c5828e82205a0a465e1bab2d0d946aa94735c748 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 15 May 2025 15:21:16 +0800
Subject: [PATCH] 2025-05-15

---
 .../service/impl/ChangeManagementServiceImpl.java   | 13 +++++++++----
 .../mapper/change/ChangeManagementMapper.xml        |  7 ++++---
 2 files changed, 13 insertions(+), 7 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 e5df5ce2..b0ebd709 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
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.spring.common.exception.XJException;
 import com.spring.common.utils.Constant;
+import com.spring.common.utils.DateUtil;
 import com.spring.common.utils.DateUtils;
 import com.spring.common.utils.PageUtils;
 import com.spring.datasource.config.AESUtil;
@@ -52,6 +53,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -758,7 +761,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                     a.setChangeNo(data.getChangeNo());
                     a.setCreateBy(data.getCreateBy());
                     if (a.getItemExecutionDate() == null) {
-                        a.setItemExecutionDate(new Date());
+                        //a.setItemExecutionDate(new Date());
+                        LocalDateTime now = LocalDateTime.now();
+                        a.setItemExecutionDate(Date.from(now.atZone(ZoneId.systemDefault()).toInstant()));
                     }
                     return a;
                 }).collect(Collectors.toList());
@@ -1363,7 +1368,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         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.getRequestId());
+        deleteUserRequestInfoParam.setRequestId(paramData.getWorkflowId() + paramData.getRequestId());
         deleteUserRequestInfoParam.setSyscode("PLM");
         List<OaUserData> oaUserList = changeManagementMapper.getOaUserIdByIsRemark(paramData.getSite(), paramData.getDocNo(), "0");
 
@@ -1397,7 +1402,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                     List<Object> params = new ArrayList<>();
                     List<Map<String, Object>> resultList;
                     // 判断有没有填写新物料编码
-                    if (StringUtils.isNotBlank(detail.getNewPartNo())) {
+                    if (StringUtils.isNotBlank(detail.getNewPartNo())) { // 选择了新物料
                         params.add(detail.getSite());
                         params.add(detail.getCodeNo());
                         params.add(detail.getNewPartNo());
@@ -1648,7 +1653,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
 
         // 2025-05-09 发送统一待办前先调用[删除异构系统指定人员待办流程]接口
         DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam();
-        deleteUserRequestInfoParam.setRequestId(paramData.getRequestId());
+        deleteUserRequestInfoParam.setRequestId(paramData.getWorkflowId() + paramData.getRequestId());
         deleteUserRequestInfoParam.setSyscode("PLM");
         List<OaUserData> oaUserList = changeManagementMapper.getOaUserIdByIsRemark(paramData.getSite(), paramData.getDocNo(), "0");
 
diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml
index e1a65cc7..27350832 100644
--- a/src/main/resources/mapper/change/ChangeManagementMapper.xml
+++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml
@@ -481,7 +481,7 @@
         insert into plm_change_item
         (site, change_no, item_no, item_desc, execute_flag, executor, item_execution_date, item_remark, create_date, create_by, code_no) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate,jdbcType=DATE}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo})
+            (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo})
         </foreach>
     </insert>
 
@@ -490,7 +490,7 @@
         insert into plm_change_FA_item
         (site, change_no, item_no, item_desc, execute_flag, executor, item_execution_date, item_remark, create_date, create_by, code_no, choose_value) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate,jdbcType=DATE}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo}, #{item.chooseValue})
+            (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo}, #{item.chooseValue})
         </foreach>
     </insert>
 
@@ -759,7 +759,7 @@
         insert into plm_change_countersignature_item
         (site, change_no, item_no, item_desc, execute_flag, executor, item_execution_date, item_remark, create_date, create_by, code_no) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate,jdbcType=DATE}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo})
+            (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo})
         </foreach>
     </insert>
 
@@ -1343,6 +1343,7 @@
 
     <select id="getRequestNodeByNodeId" resultType="com.spring.modules.request.vo.PlmRequestDetailVo">
         SELECT
+            site,
             countersignature_item
         FROM plm_request_node
         where classification_no = #{classificationNo} and site = #{site} and node_id = #{nodeId}