From e1e270c643a7c4a2bf3c2435c42821d2c50d2238 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 12 Oct 2023 10:50:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessESInitChangeController.java        | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 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 d0dc8a02..2ee70b2c 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
@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.esInitChange.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
@@ -53,27 +54,18 @@ public class ProcessESInitChangeController {
      * @param taskId
      * @param esInitChangeList
      */
-    @AutoLog(value = "企标立项变更流程-保存到待办")
-    @ApiOperation(value="企标立项变更流程-保存到待办", notes="企标立项变更流程-保存到待办")
-    @PostMapping("/saveToWait")
-    public Result<?> saveToWait(@RequestParam("taskId") String taskId,
+    @AutoLog(value = "企标立项变更流程-保存")
+    @ApiOperation(value="企标立项变更流程-保存", notes="企标立项变更流程-保存")
+    @PostMapping("/save")
+    public Result<?> saveToWait(@RequestParam(value = "taskId", required = false) String taskId,
                                 @RequestBody List<ProcessEsInitChange> esInitChangeList) {
+        if (StrUtil.isBlank(taskId)) {
+            initChangeService.saveToDraft(esInitChangeList);
+        }
         initChangeService.saveToWait(taskId, esInitChangeList);
         return Result.OK();
     }
 
-    /**
-     * 保存到草稿
-     * @param esInitChangeList
-     */
-    @AutoLog(value = "企标立项变更流程-保存到草稿")
-    @ApiOperation(value="企标立项变更流程-保存到草稿", notes="企标立项变更流程-保存到草稿")
-    @PostMapping("/saveToDraft")
-    public Result<?> saveToWait(@RequestBody List<ProcessEsInitChange> esInitChangeList) {
-        initChangeService.saveToDraft(esInitChangeList);
-        return Result.OK();
-    }
-
     /**
      * 新增立项变更申请
      *