From 5204cf063b8d891128ebfe75976a36d2a0024330 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 15 Dec 2023 15:02:39 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=8E=A5=E5=8F=A3=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/service/ActFlowCommonService.java | 5 +---- .../process/esAbolish/controller/ESAbolishController.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index b5094d6e..c671d550 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -38,7 +38,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.*; -import java.util.stream.Collectors; @Slf4j @Service @@ -355,7 +354,7 @@ public class ActFlowCommonService { return processDraftService.getOne(draftWrapper); } - public ProcessDraft getExistDraftAndRemove(CommonVO common, ProcessTypeEnum processTypeEnum) { + public void getExistDraftAndRemove(CommonVO common, ProcessTypeEnum processTypeEnum) { String taskId = common.getTaskId(); String userId = UserUtils.getUserId(); String processInstanceId = common.getProcessInstanceId(); @@ -364,10 +363,8 @@ public class ActFlowCommonService { draftWrapper.eq(ProcessDraft::getUserId, userId); draftWrapper.eq(StrUtil.isNotBlank(processInstanceId), ProcessDraft::getProcessInstanceId, processInstanceId); draftWrapper.eq(StrUtil.isNotBlank(taskId), ProcessDraft::getTaskId, taskId); - ProcessDraft draft = processDraftService.getOne(draftWrapper); // 删除草稿表数据 processDraftService.remove(draftWrapper); - return draft; } public void addDraft(CommonVO common, ProcessTypeEnum processTypeEnum, String newBusinessId) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java index 7a5d9369..703bcb15 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java @@ -60,7 +60,7 @@ public class ESAbolishController { */ @AutoLog(value = "企标废止发起流程-保存") @ApiOperation(value="企标废止发起流程-保存", notes="企标废止发起流程-保存") - @PostMapping("/saveToDraft") + @PostMapping("/save") public Result save(@Validated @RequestBody ProcessInfoVO processInfoVO) { abolishService.saveToDraft(processInfoVO); return Result.OK();