mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-30 07:06:39 +08:00
update 调整修改流程分类后更新流程分类编码
This commit is contained in:
parent
313841839b
commit
5318c8e68e
@ -18,6 +18,7 @@ import org.dromara.demo.domain.vo.TestLeaveVo;
|
|||||||
import org.dromara.demo.domain.TestLeave;
|
import org.dromara.demo.domain.TestLeave;
|
||||||
import org.dromara.demo.mapper.TestLeaveMapper;
|
import org.dromara.demo.mapper.TestLeaveMapper;
|
||||||
import org.dromara.demo.service.ITestLeaveService;
|
import org.dromara.demo.service.ITestLeaveService;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -112,6 +113,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
|
|||||||
* 批量删除请假
|
* 批量删除请假
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Boolean deleteWithValidByIds(Collection<Long> ids) {
|
public Boolean deleteWithValidByIds(Collection<Long> ids) {
|
||||||
List<String> idList = StreamUtils.toList(ids, String::valueOf);
|
List<String> idList = StreamUtils.toList(ids, String::valueOf);
|
||||||
iActProcessInstanceService.deleteRuntimeProcessAndHisInstByBusinessKeys(idList);
|
iActProcessInstanceService.deleteRuntimeProcessAndHisInstByBusinessKeys(idList);
|
||||||
|
@ -430,6 +430,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService
|
|||||||
* @param processInstanceIds 流程实例id
|
* @param processInstanceIds 流程实例id
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds) {
|
public boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds) {
|
||||||
try {
|
try {
|
||||||
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
|
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
|
||||||
|
@ -5,12 +5,17 @@ import org.dromara.common.core.utils.StringUtils;
|
|||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import org.flowable.engine.RepositoryService;
|
||||||
|
import org.flowable.engine.repository.Deployment;
|
||||||
|
import org.flowable.engine.repository.Model;
|
||||||
|
import org.flowable.engine.repository.ProcessDefinition;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.dromara.workflow.domain.bo.WfCategoryBo;
|
import org.dromara.workflow.domain.bo.WfCategoryBo;
|
||||||
import org.dromara.workflow.domain.vo.WfCategoryVo;
|
import org.dromara.workflow.domain.vo.WfCategoryVo;
|
||||||
import org.dromara.workflow.domain.WfCategory;
|
import org.dromara.workflow.domain.WfCategory;
|
||||||
import org.dromara.workflow.mapper.WfCategoryMapper;
|
import org.dromara.workflow.mapper.WfCategoryMapper;
|
||||||
import org.dromara.workflow.service.IWfCategoryService;
|
import org.dromara.workflow.service.IWfCategoryService;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@ -27,6 +32,8 @@ public class WfCategoryServiceImpl implements IWfCategoryService {
|
|||||||
|
|
||||||
private final WfCategoryMapper baseMapper;
|
private final WfCategoryMapper baseMapper;
|
||||||
|
|
||||||
|
private final RepositoryService repositoryService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询流程分类
|
* 查询流程分类
|
||||||
*/
|
*/
|
||||||
@ -70,9 +77,24 @@ public class WfCategoryServiceImpl implements IWfCategoryService {
|
|||||||
* 修改流程分类
|
* 修改流程分类
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Boolean updateByBo(WfCategoryBo bo) {
|
public Boolean updateByBo(WfCategoryBo bo) {
|
||||||
WfCategory update = MapstructUtils.convert(bo, WfCategory.class);
|
WfCategory update = MapstructUtils.convert(bo, WfCategory.class);
|
||||||
validEntityBeforeSave(update);
|
validEntityBeforeSave(update);
|
||||||
|
WfCategoryVo wfCategoryVo = baseMapper.selectVoById(bo.getId());
|
||||||
|
List<ProcessDefinition> processDefinitionList = repositoryService.createProcessDefinitionQuery().processDefinitionCategory(wfCategoryVo.getCategoryCode()).list();
|
||||||
|
for (ProcessDefinition processDefinition : processDefinitionList) {
|
||||||
|
repositoryService.setProcessDefinitionCategory(processDefinition.getId(),bo.getCategoryCode());
|
||||||
|
}
|
||||||
|
List<Deployment> deploymentList = repositoryService.createDeploymentQuery().deploymentCategory(wfCategoryVo.getCategoryCode()).list();
|
||||||
|
for (Deployment deployment : deploymentList) {
|
||||||
|
repositoryService.setDeploymentCategory(deployment.getId(),bo.getCategoryCode());
|
||||||
|
}
|
||||||
|
List<Model> modelList = repositoryService.createModelQuery().modelCategory(wfCategoryVo.getCategoryCode()).list();
|
||||||
|
for (Model model : modelList) {
|
||||||
|
model.setCategory(bo.getCategoryCode());
|
||||||
|
repositoryService.saveModel(model);
|
||||||
|
}
|
||||||
return baseMapper.updateById(update) > 0;
|
return baseMapper.updateById(update) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -277,7 +277,6 @@ public class WorkflowUtils {
|
|||||||
HistoricTaskInstance historicTaskInstance = PROCESS_ENGINE.getHistoryService().createHistoricTaskInstanceQuery().taskId(taskId).taskTenantId(TenantHelper.getTenantId()).singleResult();
|
HistoricTaskInstance historicTaskInstance = PROCESS_ENGINE.getHistoryService().createHistoricTaskInstanceQuery().taskId(taskId).taskTenantId(TenantHelper.getTenantId()).singleResult();
|
||||||
HistoricProcessInstance historicProcessInstance = PROCESS_ENGINE.getHistoryService().createHistoricProcessInstanceQuery()
|
HistoricProcessInstance historicProcessInstance = PROCESS_ENGINE.getHistoryService().createHistoricProcessInstanceQuery()
|
||||||
.processInstanceId(historicTaskInstance.getProcessInstanceId()).processInstanceTenantId(TenantHelper.getTenantId()).singleResult();
|
.processInstanceId(historicTaskInstance.getProcessInstanceId()).processInstanceTenantId(TenantHelper.getTenantId()).singleResult();
|
||||||
|
|
||||||
return historicProcessInstance.getBusinessStatus();
|
return historicProcessInstance.getBusinessStatus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user