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 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 esInitChangeList) { - initChangeService.saveToDraft(esInitChangeList); - return Result.OK(); - } - /** * 新增立项变更申请 *