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 3fb87e46..4346463f 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 @@ -128,47 +128,11 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); - draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ARCHIVE.getValue()); - draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId()); - draftWrapper.eq(ProcessDraft::getProjectId, projectId); - processDraftService.remove(draftWrapper); - saveOrUpdate(esArchive); - } - if (StrUtil.isBlank(taskId)) { - // 第一个节点点击保存没有taskId - List draftList = new ArrayList<>(); - ProcessDraft draft = new ProcessDraft(); - draft.setProjectId(esArchive.getId()); - draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.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(esArchive.getId()); - draft.setProcessInstanceId(processInstanceId); - draft.setPrcName(commonVO.getPrcName()); - draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.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) esArchive.setId(existDraft.getProjectId()); + saveOrUpdate(esArchive); + actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ARCHIVE, esArchive.getId()); } public void startRunTask(ESArchiveDataVO archiveData) {