From 98c18b07b92f80a1885e56b3413068644d0c9a51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 03 一月 2025 16:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
flowable/src/main/java/com/ycl/service/common/TaskCommonService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java b/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
index f46627d..0385cd7 100644
--- a/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
+++ b/flowable/src/main/java/com/ycl/service/common/TaskCommonService.java
@@ -2,7 +2,9 @@
import com.alibaba.fastjson2.JSONObject;
import com.ycl.common.constant.ProcessConstants;
+import com.ycl.common.core.domain.entity.SysUser;
import com.ycl.common.enums.FlowComment;
+import com.ycl.common.enums.business.TaskStatusEnum;
import com.ycl.domain.entity.SysForm;
import com.ycl.domain.vo.FormDetailVO;
import com.ycl.flow.FindNextNodeUtil;
@@ -14,6 +16,7 @@
import org.flowable.engine.RepositoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
+import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
@@ -164,7 +167,6 @@
FormDetailVO formDetailVO = new FormDetailVO();
formDetailVO.setBeforeNodeDefId(incomingFlow.getSourceFlowElement().getId());
formDetailVO.setBeforeNodeName(incomingFlow.getSourceFlowElement().getName());
- formDetailVO.setBeforeNodeName(((UserTask) incomingFlow.getSourceFlowElement()).getOwner());
defKeys.add(formDetailVO);
} else {
beforeNodeInfo(incomingFlow.getSourceFlowElement(), defKeys);
@@ -290,6 +292,10 @@
taskService.addComment(taskId, processInsId, FlowComment.REJECT.getType(), msg1 + msg);
// TODO 鐩存帴浣跨敤杩欎釜api濂藉儚鏈夐棶棰�
runtimeService.createChangeActivityStateBuilder().processInstanceId(processInsId).moveActivityIdTo(rejectTaskDefKey, rejectedTaskDefKey).changeState();
+ runtimeService.createChangeActivityStateBuilder().processInstanceId(processInsId).moveExecutionToActivityId(rejectTaskDefKey, rejectedTaskDefKey).changeState();
}
+
+
+
}
--
Gitblit v1.8.0