From f579d5c26e9e2391ba8daaa681a45f173d9d395c Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 11 Oct 2023 17:20:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B9=E4=B8=BA=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ProcessESInitChangeController.java   | 13 ++++++-------
 .../listener/ProcessESInitChangeEndListener.java    |  8 ++++++++
 .../service/ProcessEsInitChangeService.java         |  4 ++--
 .../impl/ProcessEsInitChangeServiceImpl.java        |  6 +++---
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
index 1e18185c..d0dc8a02 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
@@ -51,27 +51,26 @@ public class ProcessESInitChangeController {
     /**
      * 保存到待办
      * @param taskId
-     * @param esInitChange
+     * @param esInitChangeList
      */
     @AutoLog(value = "企标立项变更流程-保存到待办")
     @ApiOperation(value="企标立项变更流程-保存到待办", notes="企标立项变更流程-保存到待办")
     @PostMapping("/saveToWait")
     public Result<?> saveToWait(@RequestParam("taskId") String taskId,
-                                @RequestBody ProcessEsInitChange esInitChange) {
-        initChangeService.saveToWait(taskId, esInitChange);
+                                @RequestBody List<ProcessEsInitChange> esInitChangeList) {
+        initChangeService.saveToWait(taskId, esInitChangeList);
         return Result.OK();
     }
 
     /**
      * 保存到草稿
-     * @param esInitChange
+     * @param esInitChangeList
      */
     @AutoLog(value = "企标立项变更流程-保存到草稿")
     @ApiOperation(value="企标立项变更流程-保存到草稿", notes="企标立项变更流程-保存到草稿")
     @PostMapping("/saveToDraft")
-    public Result<?> saveToWait(@RequestBody ProcessEsInitChange esInitChange) {
-        // TODO 保存到草稿
-        initChangeService.saveToDraft(esInitChange);
+    public Result<?> saveToWait(@RequestBody List<ProcessEsInitChange> esInitChangeList) {
+        initChangeService.saveToDraft(esInitChangeList);
         return Result.OK();
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java
index 17fa7d8f..7a19b11a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java
@@ -14,5 +14,13 @@ public class ProcessESInitChangeEndListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
         //TODO 企标立项变更流程结束之后需要把数据存入企标计划数据库 然后自动发起企标制修订流程
+
+        // 根据流程实例Id找到所有流程业务数据
+
+        // 立项新增
+
+        // 变更编辑
+
+        // 发起制修订流程
     }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java
index 1a48282a..b63c5ede 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java
@@ -38,11 +38,11 @@ public interface ProcessEsInitChangeService extends IService<ProcessEsInitChange
      * @param taskId
      * @param esInitChange
      */
-    void saveToWait(String taskId, ProcessEsInitChange esInitChange);
+    void saveToWait(String taskId, List<ProcessEsInitChange> esInitChange);
 
     /**
      * 保存到草稿
      * @param esInitChange
      */
-    void saveToDraft(ProcessEsInitChange esInitChange);
+    void saveToDraft(List<ProcessEsInitChange> esInitChange);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index e85a74ae..0041c6bf 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -139,14 +139,14 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
     }
 
     @Override
-    public void saveToWait(String taskId, ProcessEsInitChange esInitChange) {
+    public void saveToWait(String taskId, List<ProcessEsInitChange> esInitChangeList) {
         // TODO 检查任务是否存在
         // 检查任务是否存在
-        saveOrUpdate(esInitChange);
+        saveOrUpdateBatch(esInitChangeList);
     }
 
     @Override
-    public void saveToDraft(ProcessEsInitChange esInitChange) {
+    public void saveToDraft(List<ProcessEsInitChange> esInitChange) {
         // TODO 保存到草稿
     }
 }