From 167fca631445d468536bcd4b63637484743bbcd2 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 21 Nov 2023 16:17:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessEsRecheckServiceImpl.java | 35 +++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) 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 3ad7e29c..a948b283 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 @@ -14,12 +14,14 @@ 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.esRecheck.entity.ProcessEsRecheck; import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO; import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService; import com.jero.modules.activiti.process.esRecheck.mapper.ProcessEsRecheckMapper; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.ProcessNodeLinkService; +import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.RuntimeService; @@ -113,31 +115,44 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl draftWrapper = new LambdaUpdateWrapper<>(); - if (StrUtil.isBlank(taskId)) { - // 第一个节点点击保存没有taskId + ProcessEsRecheck esRecheck = recheckData.getData(); + String projectId = esRecheck.getId(); + if (StrUtil.isBlank(projectId)) { + save(esRecheck); + } else { + // 先删后增 + LambdaUpdateWrapper 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(esArchive.getId()); + 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); - draftWrapper.eq(ProcessDraft::getProjectId, esArchive.getId()); - processDraftService.remove(draftWrapper); List draftList = new ArrayList<>(); ProcessDraft draft = new ProcessDraft(); - draft.setProjectId(esArchive.getId()); + 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); }