From 1d485289b81bb9f579ff0b88fe2ebc774e7a00bc Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 22 Nov 2023 17:23:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProcessEsAbolishServiceImpl.java | 2 ++ .../service/impl/ProcessEsArchiveServiceImpl.java | 2 ++ .../service/impl/ProcessEsEnableServiceImpl.java | 9 ++------- .../service/impl/ProcessEsInitChangeServiceImpl.java | 2 ++ .../service/impl/ProcessEsRecheckServiceImpl.java | 2 ++ 5 files changed, 10 insertions(+), 7 deletions(-) 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 dcdb960a..32cf38c7 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 @@ -79,6 +79,8 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl variables = abolishData.getFlowUser(); // 流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ABOLISH); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID 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 c7aec828..4c068afc 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 @@ -78,6 +78,8 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl variables = archiveData.getFlowUser(); // 设置流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_ARCHIVE); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID 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 be4c428f..aa8226f2 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 @@ -2,28 +2,21 @@ package com.jero.modules.activiti.process.esEnable.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; -import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.CommonVO; 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; import com.jero.modules.activiti.process.esEnable.mapper.ProcessEsEnableMapper; -import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck; 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; @@ -76,6 +69,8 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl variables = enableData.getFlowUser(); // 设置流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_ENABLE); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index e45405a2..d35aded1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -74,6 +74,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl variables = this.setVariables(initChangeData); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_INIT_CHANGE); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, variables); // 获取流程实例ID 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 08b60118..3e92d50f 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 @@ -76,6 +76,8 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl variables = recheckData.getFlowUser(); // 设置流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_RECHECK); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID