feat: 发起流程删除草稿

This commit is contained in:
2023-11-23 09:59:24 +08:00
parent 511bdd4b45
commit 1d485289b8
5 changed files with 10 additions and 7 deletions
@@ -79,6 +79,8 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
Map<String, Object> variables = abolishData.getFlowUser();
// 流程变量
Map<String, Object> actVariables = this.setVariables(variables);
// 删除草稿
actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ABOLISH);
// 启动流程
ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
// 获取流程实例ID
@@ -78,6 +78,8 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
Map<String, Object> variables = archiveData.getFlowUser();
// 设置流程变量
Map<String, Object> actVariables = this.setVariables(variables);
// 删除草稿
actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_ARCHIVE);
// 启动流程
ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
// 获取流程实例ID
@@ -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<ProcessEsEnableMappe
Map<String, Object> variables = enableData.getFlowUser();
// 设置流程变量
Map<String, Object> actVariables = this.setVariables(variables);
// 删除草稿
actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_ENABLE);
// 启动流程
ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
// 获取流程实例ID
@@ -74,6 +74,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
CommonVO commonVO = initChangeData.getCommonVO();
// 设置流程变量
Map<String, Object> variables = this.setVariables(initChangeData);
// 删除草稿
actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_INIT_CHANGE);
// 启动流程
ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, variables);
// 获取流程实例ID
@@ -76,6 +76,8 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
Map<String, Object> variables = recheckData.getFlowUser();
// 设置流程变量
Map<String, Object> actVariables = this.setVariables(variables);
// 删除草稿
actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_RECHECK);
// 启动流程
ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
// 获取流程实例ID