From 318c0a4f2cb1356244dbb6447e1fe47def23719b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 16 May 2025 14:35:42 +0800
Subject: [PATCH] 2025-05-16

---
 .../ChangeManagementController.java           | 12 ++++++
 .../service/ChangeManagementService.java      |  2 +
 .../impl/ChangeManagementServiceImpl.java     | 39 +++++++++++++++----
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java b/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java
index e6d241c9..2b40a11c 100644
--- a/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java
+++ b/src/main/java/com/spring/modules/change/controller/ChangeManagementController.java
@@ -439,4 +439,16 @@ public class ChangeManagementController {
         return R.ok();
     }
 
+    /**
+     * 会签执行
+     * @param data
+     * @return
+     */
+    @PostMapping(value="/csExecute")
+    @ResponseBody
+    public R csExecute(@RequestBody ChangeRequestVo data) {
+        changeManagementService.csExecute(data);
+        return R.ok();
+    }
+
 }
diff --git a/src/main/java/com/spring/modules/change/service/ChangeManagementService.java b/src/main/java/com/spring/modules/change/service/ChangeManagementService.java
index 8278614b..a8de5a6b 100644
--- a/src/main/java/com/spring/modules/change/service/ChangeManagementService.java
+++ b/src/main/java/com/spring/modules/change/service/ChangeManagementService.java
@@ -82,4 +82,6 @@ public interface ChangeManagementService {
     PageUtils choosePartNoList(PlmProjectPartData data);
 
     void tpExecute(ChangeRequestVo data);
+
+    void csExecute(ChangeRequestVo data);
 }
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 829613f6..1011b2e3 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
@@ -762,11 +762,11 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 List<ChangeCountersignatureItemEntity> itemList = data.getChooseCSItemList().stream().map(a -> {
                     a.setChangeNo(data.getChangeNo());
                     a.setCreateBy(data.getCreateBy());
-                    if (a.getItemExecutionDate() == null) {
-                        //a.setItemExecutionDate(new Date());
-                        LocalDateTime now = LocalDateTime.now();
-                        a.setItemExecutionDate(Date.from(now.atZone(ZoneId.systemDefault()).toInstant()));
-                    }
+//                    if (a.getItemExecutionDate() == null) {
+//                        //a.setItemExecutionDate(new Date());
+//                        LocalDateTime now = LocalDateTime.now();
+//                        a.setItemExecutionDate(Date.from(now.atZone(ZoneId.systemDefault()).toInstant()));
+//                    }
                     return a;
                 }).collect(Collectors.toList());
                 changeManagementMapper.chooseCSItemSave(itemList);
@@ -1905,7 +1905,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
     }
 
     /**
-     * 提交
+     * TP执行
      * @param data
      */
     @Override
@@ -1923,7 +1923,32 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         cData.setRoleId(4);
         List<PlmProcessControllBaseData> controlList =  requestManageMapper.getProcessSelect2(cData);
         if (controlList.isEmpty()) {
-            throw new RuntimeException("当前节点不能点击执行，请检查流程节点配置!");
+            throw new RuntimeException("当前节点不能点击TP执行，请检查流程节点配置!");
+        }
+        // 提交
+        submitChange(data);
+    }
+
+    /**
+     * 会签执行
+     * @param data
+     */
+    @Override
+    @Transactional
+    public void csExecute(ChangeRequestVo data) {
+        // 判断节点的特殊管控 （TP执行信息特殊管控）
+        List<ProcessFormEntity> processFormList = changeManagementMapper.queryRequestId(data.getSite(), "", data.getChangeNo());
+        if (processFormList.isEmpty()) {
+            throw new RuntimeException("流程请求ID获取有误!");
+        }
+        PlmProcessControllBaseData cData = new PlmProcessControllBaseData();
+        cData.setSite(data.getSite());
+        cData.setNodeId(processFormList.get(0).getNodeId());
+        cData.setWorkflowId(processFormList.get(0).getWorkflowId());
+        cData.setRoleId(5);
+        List<PlmProcessControllBaseData> controlList =  requestManageMapper.getProcessSelect2(cData);
+        if (controlList.isEmpty()) {
+            throw new RuntimeException("当前节点不能点击会签执行，请检查流程节点配置!");
         }
         // 提交
         submitChange(data);