From 9a8822d609e8ccf1b85a46a07ad8d51a76b784fa Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 22 Nov 2023 15:29:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=BA=9F=E6=AD=A2=20=E5=B0=81=E5=AD=98?= =?UTF-8?q?=20=E5=A4=8D=E5=AE=A1=20=E5=90=AF=E7=94=A8=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=92=8C=E8=8D=89=E7=A8=BF=E5=8A=9E=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ESAbolishController.java | 18 ++++- .../service/ProcessEsAbolishService.java | 2 + .../impl/ProcessEsAbolishServiceImpl.java | 68 ++++++++---------- .../controller/ESArchiveController.java | 15 ++++ .../service/ProcessEsArchiveService.java | 2 + .../impl/ProcessEsArchiveServiceImpl.java | 24 ++++++- .../controller/ESEnableController.java | 17 ++++- .../service/ProcessEsEnableService.java | 1 + .../impl/ProcessEsEnableServiceImpl.java | 69 ++++++++----------- .../controller/ESRecheckController.java | 15 ++++ .../service/ProcessEsRecheckService.java | 2 + .../impl/ProcessEsRecheckServiceImpl.java | 68 ++++++++---------- 12 files changed, 175 insertions(+), 126 deletions(-) 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 88140a48..2b77028d 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 @@ -9,6 +9,7 @@ import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -45,7 +46,7 @@ public class ESAbolishController { } /** - * 保存到待办 + * 保存到草稿 * @param abolishData */ @AutoLog(value = "企标废止发起流程-保存") @@ -56,6 +57,21 @@ public class ESAbolishController { return Result.OK(); } + /** + * 草稿办理 + * @param draftId + * @param projectId + */ + @AutoLog(value = "企标废止发起流程-草稿办理") + @ApiOperation(value="企标废止发起流程-草稿办理", notes="企标废止发起流程-草稿办理") + @GetMapping("/draftHandle") + @Translation + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, + @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { + return Result.OK(abolishService.getDraftData(draftId, projectId)); + } + + /** * 保存到待办 * @param taskId diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java index b393883c..58e3f3a9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/ProcessEsAbolishService.java @@ -18,4 +18,6 @@ public interface ProcessEsAbolishService extends IService { ESAbolishDataVO getHandleData(String taskId); void approval(ESAbolishDataVO annualInitData, boolean pass); + + ESAbolishDataVO getDraftData(String draftId, String projectId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java index cd95b2d0..16641d44 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java @@ -17,6 +17,8 @@ import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish; import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO; import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService; import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper; +import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; @@ -129,48 +131,11 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); - draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ABOLISH.getValue()); - draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); - draftWrapper.eq(ProcessDraft::getProjectId, projectId); - processDraftService.remove(draftWrapper); - saveOrUpdate(esAbolish); - } - String id = esAbolish.getId(); - if (StrUtil.isBlank(taskId)) { - // 第一个节点点击保存没有taskId - List draftList = new ArrayList<>(); - ProcessDraft draft = new ProcessDraft(); - draft.setProjectId(id); - draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue()); - draft.setPrcName(commonVO.getPrcName()); - draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注 - draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件 - draft.setUserId(CurrentUserUtil.getId()); // 用户id - draftList.add(draft); - processDraftService.saveBatch(draftList); - } else { - String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); - List draftList = new ArrayList<>(); - ProcessDraft draft = new ProcessDraft(); - draft.setProjectId(id); - draft.setProcessInstanceId(processInstanceId); - draft.setPrcName(commonVO.getPrcName()); - draft.setPrcType(ProcessTypeEnum.ES_ABOLISH.getValue()); - draft.setTaskId(taskId); // 任务id - draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注 - draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件 - draft.setUserId(CurrentUserUtil.getId()); // 用户id - draftList.add(draft); - processDraftService.saveBatch(draftList); - } + ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ABOLISH); + if (existDraft != null) esAbolish.setId(existDraft.getProjectId()); + saveOrUpdate(esAbolish); + actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ABOLISH, esAbolish.getId()); } public void startRunTask(ESAbolishDataVO abolishData) { @@ -219,6 +184,27 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ProcessEsAbolish::getId, businessId); + lambdaQueryWrapper.eq(ProcessEsAbolish::getDelFlag, YesOrNoEnum.NO.getValue()); + ProcessEsAbolish data = getOne(lambdaQueryWrapper); + abolishDataVO.setData(data); + return abolishDataVO; + } + return null; } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java index 6c9d5a14..0a159f9a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java @@ -9,6 +9,7 @@ import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -68,6 +69,20 @@ public class ESArchiveController { return Result.OK(archiveService.getHandleData(taskId)); } + /** + * 草稿办理 + * @param draftId + * @param projectId + */ + @AutoLog(value = "企标封存流程-草稿办理") + @ApiOperation(value="企标封存流程-草稿办理", notes="企标封存流程-草稿办理") + @GetMapping("/draftHandle") + @Translation + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, + @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { + return Result.OK(archiveService.getDraftData(draftId, projectId)); + } + /** * 同意 * diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java index c4f0d552..161c6ca2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/ProcessEsArchiveService.java @@ -18,4 +18,6 @@ public interface ProcessEsArchiveService extends IService { ESArchiveDataVO getHandleData(String taskId); void approval(ESArchiveDataVO archiveData, boolean pass); + + ESArchiveDataVO getDraftData(String draftId, String projectId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java index 4346463f..b024a75f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java @@ -17,6 +17,8 @@ import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService; import com.jero.modules.activiti.process.esArchive.mapper.ProcessEsArchiveMapper; +import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; +import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.service.ProcessNodeService; @@ -147,7 +149,6 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ProcessEsArchive::getId, businessId); + lambdaQueryWrapper.eq(ProcessEsArchive::getDelFlag, YesOrNoEnum.NO.getValue()); + ProcessEsArchive data = getOne(lambdaQueryWrapper); + archiveDataVO.setData(data); + return archiveDataVO; + } + return null; } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java index 75d3a242..7fa2aac5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java @@ -9,6 +9,7 @@ import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO; import com.jero.modules.activiti.process.esEnable.service.ProcessEsEnableService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -45,7 +46,7 @@ public class ESEnableController { } /** - * 保存到待办 + * 保存到草稿 * @param enableData */ @AutoLog(value = "企标启用发起流程-保存") @@ -56,6 +57,20 @@ public class ESEnableController { return Result.OK(); } + /** + * 草稿办理 + * @param draftId + * @param projectId + */ + @AutoLog(value = "企标封存流程-草稿办理") + @ApiOperation(value="企标封存流程-草稿办理", notes="企标封存流程-草稿办理") + @GetMapping("/draftHandle") + @Translation + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, + @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { + return Result.OK(enableService.getDraftData(draftId, projectId)); + } + /** * 保存到待办 * @param taskId diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java index 8b824852..8e0bcb40 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/ProcessEsEnableService.java @@ -19,4 +19,5 @@ public interface ProcessEsEnableService extends IService { void approval(ESEnableDataVO enableData, boolean pass); + ESEnableDataVO getDraftData(String draftId, String projectId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java index 1a2beac6..8547bdcb 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java @@ -13,6 +13,9 @@ import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ProcessDraftService; +import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; +import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable; +import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO; import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable; import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO; import com.jero.modules.activiti.process.esEnable.service.ProcessEsEnableService; @@ -125,48 +128,11 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); - draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ENABLE.getValue()); - draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); - draftWrapper.eq(ProcessDraft::getProjectId, projectId); - processDraftService.remove(draftWrapper); - saveOrUpdate(esEnable); - } - String id = esEnable.getId(); - if (StrUtil.isBlank(taskId)) { - // 第一个节点点击保存没有taskId - List draftList = new ArrayList<>(); - ProcessDraft draft = new ProcessDraft(); - draft.setProjectId(id); - draft.setPrcType(ProcessTypeEnum.ES_ENABLE.getValue()); - draft.setPrcName(commonVO.getPrcName()); - draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注 - draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件 - draft.setUserId(CurrentUserUtil.getId()); // 用户id - draftList.add(draft); - processDraftService.saveBatch(draftList); - } else { - String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); - List draftList = new ArrayList<>(); - ProcessDraft draft = new ProcessDraft(); - draft.setProjectId(id); - draft.setProcessInstanceId(processInstanceId); - draft.setPrcName(commonVO.getPrcName()); - draft.setPrcType(ProcessTypeEnum.ES_ENABLE.getValue()); - draft.setTaskId(taskId); // 任务id - draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注 - draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件 - draft.setUserId(CurrentUserUtil.getId()); // 用户id - draftList.add(draft); - processDraftService.saveBatch(draftList); - } + ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ARCHIVE); + if (existDraft != null) esEnable.setId(existDraft.getProjectId()); + saveOrUpdate(esEnable); + actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ENABLE, esEnable.getId()); } public void startRunTask(ESEnableDataVO enableData) { @@ -215,6 +181,27 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ProcessEsEnable::getId, projectId); + lambdaQueryWrapper.eq(ProcessEsEnable::getDelFlag, YesOrNoEnum.NO.getValue()); + ProcessEsEnable data = getOne(lambdaQueryWrapper); + enableDataVO.setData(data); + return enableDataVO; + } + return null; } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java index 87ffd657..7c9b91de 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java @@ -9,6 +9,7 @@ import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO; import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -68,6 +69,20 @@ public class ESRecheckController { return Result.OK(recheckService.getHandleData(taskId)); } + /** + * 草稿办理 + * @param draftId + * @param projectId + */ + @AutoLog(value = "企标复审流程-草稿办理") + @ApiOperation(value="企标复审流程-草稿办理", notes="企标复审流程-草稿办理") + @GetMapping("/draftHandle") + @Translation + public Result draftHandle(@RequestParam("draftId") @ApiParam("草稿Id") String draftId, + @RequestParam("projectId") @ApiParam("业务数据Id") String projectId) { + return Result.OK(recheckService.getDraftData(draftId, projectId)); + } + /** * 同意 * diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java index d0519f26..e1aeb42a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/ProcessEsRecheckService.java @@ -18,4 +18,6 @@ public interface ProcessEsRecheckService extends IService { ESRecheckDataVO getHandleData(String taskId); void approval(ESRecheckDataVO recheckData, boolean pass); + + ESRecheckDataVO getDraftData(String draftId, String projectId); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java index a948b283..35e2605a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java @@ -15,6 +15,8 @@ import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; +import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; +import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck; import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO; import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService; @@ -114,48 +116,11 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); - draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_RECHECK.getValue()); - draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); - draftWrapper.eq(ProcessDraft::getProjectId, projectId); - processDraftService.remove(draftWrapper); - saveOrUpdate(esRecheck); - } - String id = esRecheck.getId(); - if (StrUtil.isBlank(taskId)) { - // 第一个节点点击保存没有taskId - List draftList = new ArrayList<>(); - ProcessDraft draft = new ProcessDraft(); - draft.setProjectId(id); - draft.setPrcType(ProcessTypeEnum.ES_RECHECK.getValue()); - draft.setPrcName(commonVO.getPrcName()); - draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注 - draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件 - draft.setUserId(CurrentUserUtil.getId()); // 用户id - draftList.add(draft); - processDraftService.saveBatch(draftList); - } else { - String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); - List draftList = new ArrayList<>(); - ProcessDraft draft = new ProcessDraft(); - draft.setProjectId(id); - draft.setProcessInstanceId(processInstanceId); - draft.setPrcName(commonVO.getPrcName()); - draft.setPrcType(ProcessTypeEnum.ES_RECHECK.getValue()); - draft.setTaskId(taskId); // 任务id - draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注 - draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件 - draft.setUserId(CurrentUserUtil.getId()); // 用户id - draftList.add(draft); - processDraftService.saveBatch(draftList); - } + ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_RECHECK); + if (existDraft != null) esRecheck.setId(existDraft.getProjectId()); + saveOrUpdate(esRecheck); + actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_RECHECK, esRecheck.getId()); } public void startRunTask(ESRecheckDataVO recheckData) { @@ -207,6 +172,27 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ProcessEsRecheck::getId, businessId); + lambdaQueryWrapper.eq(ProcessEsRecheck::getDelFlag, YesOrNoEnum.NO.getValue()); + ProcessEsRecheck data = getOne(lambdaQueryWrapper); + recheckDataVO.setData(data); + return recheckDataVO; + } + return null; } }