|
|
|
|
@ -15,7 +15,6 @@ import org.dromara.warm.flow.core.entity.Task;
|
|
|
|
|
import org.dromara.warm.flow.core.listener.GlobalListener;
|
|
|
|
|
import org.dromara.warm.flow.core.listener.ListenerVariable;
|
|
|
|
|
import org.dromara.warm.flow.core.service.InsService;
|
|
|
|
|
import org.dromara.warm.flow.orm.entity.FlowTask;
|
|
|
|
|
import org.dromara.workflow.common.ConditionalOnEnable;
|
|
|
|
|
import org.dromara.workflow.common.constant.FlowConstant;
|
|
|
|
|
import org.dromara.workflow.common.enums.TaskStatusEnum;
|
|
|
|
|
@ -126,7 +125,7 @@ public class WorkflowGlobalListener implements GlobalListener {
|
|
|
|
|
if (StringUtils.isNotBlank(status)) {
|
|
|
|
|
flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, status, params, false);
|
|
|
|
|
}
|
|
|
|
|
if (task != null && nextTasks.size() == 1 && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) {
|
|
|
|
|
if (task != null && CollUtil.isNotEmpty(nextTasks) && nextTasks.size() == 1 && flwCommonService.applyNodeCode(definition.getId()).equals(nextTasks.get(0).getNodeCode())) {
|
|
|
|
|
//如果为画线指定驳回 线条指定为驳回 驳回得节点为申请人节点 则修改流程状态为退回
|
|
|
|
|
flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, BusinessStatusEnum.BACK.getStatus(), params, false);
|
|
|
|
|
//修改流程实例状态
|
|
|
|
|
@ -185,7 +184,6 @@ public class WorkflowGlobalListener implements GlobalListener {
|
|
|
|
|
return flowStatus;
|
|
|
|
|
} else {
|
|
|
|
|
Long instanceId = instance.getId();
|
|
|
|
|
List<FlowTask> flowTasks = flwTaskService.selectByInstId(instanceId);
|
|
|
|
|
if (flwTaskService.isTaskEnd(instanceId)) {
|
|
|
|
|
String status = BusinessStatusEnum.FINISH.getStatus();
|
|
|
|
|
// 更新流程状态为已完成
|
|
|
|
|
|