Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm

This commit is contained in:
YunaiV
2025-03-23 17:06:54 +08:00
603 changed files with 23595 additions and 9473 deletions

View File

@@ -981,7 +981,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
BpmnModel bpmnModel = modelService.getBpmnModelByDefinitionId(taskList.get(0).getProcessDefinitionId());
List<String> activityIds = CollUtil.newArrayList(convertSet(taskList, Task::getTaskDefinitionKey));
EndEvent endEvent = BpmnModelUtils.getEndEvent(bpmnModel);
Assert.notNull(endEvent, "结束节点不能");
Assert.notNull(endEvent, "结束节点不能");
runtimeService.createChangeActivityStateBuilder()
.processInstanceId(processInstanceId)
.moveActivityIdsToSingleActivityId(activityIds, endEvent.getId())

View File

@@ -17,6 +17,7 @@ import org.springframework.web.client.RestTemplate;
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils.parseListenerConfig;
// TODO @芋艿:可能会想换个包地址
/**
* BPM 用户任务通用监听器
*

View File

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.bpm.service.task.trigger;
import cn.iocoder.yudao.module.bpm.enums.definition.BpmTriggerTypeEnum;
// TODO @芋艿:可能会想换个包地址
/**
* BPM 触发器接口
* <p>