diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmProcessNodeProgressEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmProcessNodeProgressEnum.java
deleted file mode 100644
index e8095e4a5..000000000
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmProcessNodeProgressEnum.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package cn.iocoder.yudao.module.bpm.enums.definition;
-
-import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 流程节点进度的枚举
- *
- * @author jason
- */
-@Getter
-@AllArgsConstructor
-public enum BpmProcessNodeProgressEnum {
-
-    // 0 未开始
-    NOT_START(0,"未开始"),
-    // 1 ~ 20 进行中
-    RUNNING(1, "进行中"),  // 节点的进行
-    // 特殊的进行中状态
-    USER_TASK_DELEGATE(10, "委派中"), // 审批节点
-    USER_TASK_APPROVING(11, "向后加签审批通过中"), //向后加签 审批通过中.
-    USER_TASK_WAIT(12, "待审批"), // 一般用于先前加签
-
-    // 30 ~ 50 已经结束
-    // 30 ~ 40 审批节点的结束状态
-    USER_TASK_APPROVE(30, "审批通过"), // 审批节点
-    USER_TASK_REJECT(31, "审批不通过"), // 审批节点
-    USER_TASK_RETURN(32, "已退回"), // 审批节点
-    USER_TASK_CANCEL(34, "已取消"), // 审批节点
-    // 40 ~ 50 节点的通用结束状态
-    FINISHED(41, "已结束"), // 一般节点的节点的结束状态
-    SKIP(42, "跳过"); // 未执行，跳过的节点
-
-    private final Integer status;
-    private final String name;
-
-    public static Integer convertBpmnTaskStatus(Integer taskStatus) {
-        Integer convertStatus = null;
-        if (BpmTaskStatusEnum.RUNNING.getStatus().equals(taskStatus)) {
-            convertStatus =  RUNNING.getStatus();
-        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(taskStatus)) {
-            convertStatus = USER_TASK_REJECT.getStatus();
-        } else if( BpmTaskStatusEnum.APPROVE.getStatus().equals(taskStatus) ) {
-            convertStatus = USER_TASK_APPROVE.getStatus();
-        } else if (BpmTaskStatusEnum.DELEGATE.getStatus().equals(taskStatus)) {
-            convertStatus = USER_TASK_DELEGATE.getStatus();
-        } else if (BpmTaskStatusEnum.APPROVING.getStatus().equals(taskStatus)) {
-            convertStatus = USER_TASK_APPROVE.getStatus();
-        } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(taskStatus)) {
-            convertStatus = USER_TASK_CANCEL.getStatus();
-        } else if (BpmTaskStatusEnum.WAIT.getStatus().equals(taskStatus)) {
-            convertStatus = USER_TASK_WAIT.getStatus();
-        }
-        return convertStatus;
-    }
-
-    /**
-     * 判断用户节点是不是未通过
-     *
-     * @param status 状态
-     */
-    public static boolean isUserTaskNotApproved(Integer status) {
-        return ObjectUtils.equalsAny(status,
-                USER_TASK_REJECT.getStatus(), USER_TASK_RETURN.getStatus(), USER_TASK_CANCEL.getStatus());
-    }
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
index e754a9da1..621a7a5da 100644
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeType.java
@@ -18,26 +18,27 @@ import java.util.Objects;
 public enum BpmSimpleModelNodeType implements IntArrayValuable {
 
     // 0 ~ 1 开始和结束
-    START_NODE(0, "开始节点"),
-    END_NODE(1, "结束节点"),
+    START_NODE(0, "startEvent", "开始节点"),
+    END_NODE(1, "endEvent", "结束节点"),
 
     // 10 ~ 49 各种节点
-    START_USER_NODE(10, "发起人节点"), // 发起人节点。前端的开始节点，Id 固定
-    APPROVE_NODE(11, "审批人节点"),
-    COPY_NODE(12, "抄送人节点"),
+    START_USER_NODE(10, "userTask", "发起人节点"), // 发起人节点。前端的开始节点，Id 固定
+    APPROVE_NODE(11, "userTask", "审批人节点"),
+    COPY_NODE(12, "serviceTask", "抄送人节点"),
 
     // 50 ~ 条件分支
-    CONDITION_NODE(50, "条件节点"), // 用于构建流转条件的表达式
-    CONDITION_BRANCH_NODE(51, "条件分支节点"), // TODO @jason：是不是改成叫 条件分支？
-    PARALLEL_BRANCH_NODE(52, "并行分支节点"), // TODO @jason：是不是一个 并行分支 ？就可以啦？ 后面是否去掉并行网关。只用包容网关
-    INCLUSIVE_BRANCH_NODE(53, "包容分支节点"),
+    CONDITION_NODE(50, "sequenceFlow", "条件节点"), // 用于构建流转条件的表达式
+    CONDITION_BRANCH_NODE(51, " “parallelGateway”", "条件分支节点"), // TODO @jason：是不是改成叫 条件分支？
+    PARALLEL_BRANCH_NODE(52, "exclusiveGateway", "并行分支节点"), // TODO @jason：是不是一个 并行分支 ？就可以啦？ 后面是否去掉并行网关。只用包容网关
+    INCLUSIVE_BRANCH_NODE(53, "inclusiveGateway", "包容分支节点"),
     // TODO @jason：建议整合 join，最终只有 条件分支、并行分支、包容分支，三种~
     // TODO @芋艿。 感觉还是分开好理解一点,也好处理一点。前端结构中把聚合节点显示并传过来。
     ;
 
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(BpmSimpleModelNodeType::getType).toArray();
-
+    public static final String  BPMN_USER_TASK_TYPE ="userTask";
     private final Integer type;
+    private final String bpmnType;
     private final String name;
 
     /**
@@ -48,7 +49,17 @@ public enum BpmSimpleModelNodeType implements IntArrayValuable {
     public static boolean isBranchNode(Integer type) {
         return Objects.equals(CONDITION_BRANCH_NODE.getType(), type)
                 || Objects.equals(PARALLEL_BRANCH_NODE.getType(), type)
-                || Objects.equals(INCLUSIVE_BRANCH_NODE.getType(), type) ;
+                || Objects.equals(INCLUSIVE_BRANCH_NODE.getType(), type);
+    }
+
+    /**
+     * 判断是否需要记录的节点
+     *
+     * @param bpmnType bpmn节点类型
+     */
+    public static boolean isRecordNode(String bpmnType) {
+        return Objects.equals(APPROVE_NODE.getBpmnType(), bpmnType)
+                || Objects.equals(END_NODE.getBpmnType(), bpmnType);
     }
 
     public static BpmSimpleModelNodeType valueOf(Integer type) {
diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
index 40a385a58..cddb11bf2 100644
--- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
+++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
@@ -12,7 +12,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum BpmTaskStatusEnum {
-
+    NOT_START(-1, "未开始"),
     RUNNING(1, "审批中"),
     APPROVE(2, "审批通过"),
     REJECT(3, "审批不通过"),
@@ -57,5 +57,9 @@ public enum BpmTaskStatusEnum {
                 APPROVE.getStatus(), REJECT.getStatus(), CANCEL.getStatus(),
                 RETURN.getStatus(), APPROVING.getStatus());
     }
+    public static boolean isEndStatusButNotApproved(Integer status) {
+        return ObjectUtils.equalsAny(status,
+                REJECT.getStatus(), CANCEL.getStatus(), RETURN.getStatus());
+    }
 
 }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceProgressRespVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceProgressRespVO.java
index 90af0213c..e98361551 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceProgressRespVO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceProgressRespVO.java
@@ -14,41 +14,35 @@ public class BpmProcessInstanceProgressRespVO {
     @Schema(description = "流程实例的状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status; // 参见 BpmProcessInstanceStatusEnum 枚举
 
-    private List<ProcessNodeProgress> nodeProgressList;
+    @Schema(description = "审批信息列表", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<ApproveNodeInfo> approveNodeList;
 
-    @Schema(description = "节点进度信息")
+    @Schema(description = "审批节点信息")
     @Data
-    public static class ProcessNodeProgress {
+    public static class ApproveNodeInfo {
 
         @Schema(description = "节点编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "StartUserNode")
-        private String id;  // Bpmn XML 节点 Id
+        private String id;
 
         @Schema(description = "节点名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "发起人")
         private String name;
 
-        @Schema(description = "节点展示内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "指定成员: 芋道源码")
-        private String displayText;
-
         @Schema(description = "节点类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
         private Integer nodeType; // 参见 BpmSimpleModelNodeType 枚举
 
-        // TODO @jason：可以复用 BpmTaskStatusEnum 么？非必要不加太多状态枚举哈
         @Schema(description = "节点状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
-        private Integer status; // 参见 BpmProcessNodeProgressEnum 枚举
+        private Integer status; // 参见 BpmTaskStatusEnum 枚举
 
         @Schema(description = "节点的开始时间")
         private LocalDateTime startTime;
         @Schema(description = "节点的结束时间")
         private LocalDateTime endTime;
 
-        @Schema(description = "用户列表")
-        private List<User> userList;
+        @Schema(description = "审批节点的任务信息")
+        private List<ApproveTaskInfo> tasks;
 
-        // TODO @jason：如果条件信息，怎么展示哈？
-        @Schema(description = "分支节点")
-        private List<ProcessNodeProgress> branchNodes;  // 有且仅有条件、并行、包容节点才会有分支节点
-
-        // TODO 用户意见，评论
+        @Schema(description = "候选人用户列表")
+        private List<User> candidateUserList; // 用于未运行任务节点
 
     }
 
@@ -65,14 +59,25 @@ public class BpmProcessInstanceProgressRespVO {
         @Schema(description = "用户头像", example = "芋艿")
         private String avatar;
 
-        // TODO @jason：是不是把 processed 和 userTaskStatus 合并？
+    }
+    @Schema(description = "审批任务信息")
+    @Data
+    public static class ApproveTaskInfo {
 
-        @Schema(description = "是否已处理", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-        private Boolean processed;
+        @Schema(description = "任务编号",  example = "1")
+        private String id;
 
-        @Schema(description = "用户任务的处理状态", example = "1")
-        private Integer userTaskStatus;
+        @Schema(description = "任务所属人")
+        private User ownerUser;
 
+        @Schema(description = "任务分配人")
+        private User assigneeUser;
+
+        @Schema(description = "任务状态", example = "1")
+        private Integer status;  // 参见 BpmTaskStatusEnum 枚举
+
+        @Schema(description = "审批意见", example = "同意")
+        private String reason;
     }
 
 }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java
index f9198e43b..53e75c5d9 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnModelConstants.java
@@ -109,4 +109,9 @@ public interface BpmnModelConstants {
      */
     String START_EVENT_NODE_NAME = "开始";
 
+    /**
+     * 发起人节点 Id
+     */
+    String START_USER_NODE_ID = "StartUserNode";
+
 }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
index 158dfd3ee..cffaa61b2 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
@@ -7,23 +7,23 @@ import cn.hutool.core.lang.TypeReference;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.*;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
-import cn.iocoder.yudao.framework.common.util.spring.SpringUtils;
 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.RejectHandler;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ProcessNodeProgress;
-import cn.iocoder.yudao.module.bpm.enums.definition.*;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmBoundaryEventType;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModeConditionType;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType;
+import cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskApproveMethodEnum;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.listener.BpmCopyTaskDelegate;
 import cn.iocoder.yudao.module.bpm.framework.flowable.core.simplemodel.SimpleModelConditionGroups;
-import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService;
 import org.flowable.bpmn.BpmnAutoLayout;
 import org.flowable.bpmn.model.Process;
 import org.flowable.bpmn.model.*;
-import org.flowable.engine.history.HistoricActivityInstance;
-import org.flowable.engine.history.HistoricProcessInstance;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.OperationButtonSetting;
 import static cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO.TimeoutHandler;
@@ -218,7 +218,7 @@ public class SimpleModelUtils {
      *
      * @param conditionNode 条件节点
      */
-    private static String buildConditionExpression(BpmSimpleModelNodeVO conditionNode) {
+    public static String buildConditionExpression(BpmSimpleModelNodeVO conditionNode) {
         Integer conditionType = MapUtil.getInt(conditionNode.getAttributes(), CONDITION_TYPE_ATTRIBUTE);
         BpmSimpleModeConditionType conditionTypeEnum = BpmSimpleModeConditionType.valueOf(conditionType);
         String conditionExpression = null;
@@ -293,7 +293,7 @@ public class SimpleModelUtils {
         traverseNodeToBuildFlowNode(node.getChildNode(), process);
     }
 
-    private static boolean isValidNode(BpmSimpleModelNodeVO node) {
+    public static boolean isValidNode(BpmSimpleModelNodeVO node) {
         return node != null && node.getId() != null;
     }
 
@@ -635,117 +635,4 @@ public class SimpleModelUtils {
         return endEvent;
     }
 
-    /**
-     *  遍历简单模型, 构建节点的进度。 TODO 回退节点暂未处理
-     *
-     * @param processInstance 流程实例
-     * @param simpleModel 简单模型
-     * @param historicActivityList 流程实例的活力列表
-     * @param activityInstanceMap 流程实例的活力 Map。 key: activityId
-     * @param nodeProgresses  节点的进度列表
-     * @param returnNodePosition 回退节点的位置。 TODO 处理回退节点，还未处理。还没想好
-     */
-    public static void traverseNodeToBuildNodeProgress(HistoricProcessInstance processInstance, BpmSimpleModelNodeVO simpleModel
-            , List<HistoricActivityInstance> historicActivityList, Map<String, HistoricActivityInstance> activityInstanceMap
-            , List<ProcessNodeProgress> nodeProgresses, List<Integer> returnNodePosition) {
-        // 判断是否有效节点
-        if (!isValidNode(simpleModel)) {
-            return;
-        }
-        buildNodeProgress(processInstance, simpleModel, nodeProgresses, historicActivityList, activityInstanceMap, returnNodePosition);
-        // 如果有“子”节点，则递归处理子节点
-        // TODO @jason：需要根据条件，是否继续递归。例如说，一共有 3 个 node；第 2 个 node 审批不通过了。那么第 3 个 node 就不用了。（微信讨论下）
-        traverseNodeToBuildNodeProgress(processInstance, simpleModel.getChildNode(), historicActivityList, activityInstanceMap, nodeProgresses, returnNodePosition);
-    }
-
-    // TODO @芋艿，@jason：可重构优化的点，SimpleModelUtils 负责提供一个遍历的方法，有个 Function 进行每个节点的处理。目的是，把逻辑拿回到 Service 里面；或者说，减少 Utils 去调用 Service
-    private static void buildNodeProgress(HistoricProcessInstance processInstance, BpmSimpleModelNodeVO node, List<ProcessNodeProgress> nodeProgresses,
-                                          List<HistoricActivityInstance> historicActivityList, Map<String, HistoricActivityInstance> activityInstanceMap, List<Integer> returnNodePosition) {
-        BpmSimpleModelNodeType nodeType = BpmSimpleModelNodeType.valueOf(node.getType());
-        Assert.notNull(nodeType, "模型节点类型不支持");
-
-        ProcessNodeProgress nodeProgress = new ProcessNodeProgress();
-        nodeProgress.setNodeType(nodeType.getType());
-        nodeProgress.setName(node.getName());
-        nodeProgress.setDisplayText(node.getShowText());
-        BpmActivityService activityService = SpringUtils.getBean(BpmActivityService.class);
-        if (!activityInstanceMap.containsKey(node.getId())) { // 说明这些节点没有执行过
-            // 1. 得到流程状态
-            Integer processInstanceStatus = FlowableUtils.getProcessInstanceStatus(processInstance);
-            // 2. 设置节点状态
-            nodeProgress.setStatus(activityService.getNotRunActivityProgressStatus(processInstanceStatus));
-            // 3. 抄送节点, 审批节点设置用户列表
-            // TODO @芋艿：抄送节点，要不要跳过（不展示）
-            if (COPY_NODE.getType().equals(node.getType()) ||
-                    (APPROVE_NODE.getType().equals(node.getType()) && USER.getType().equals(node.getApproveType()))) {
-                nodeProgress.setUserList(activityService.getNotRunActivityUserList(processInstance.getId()
-                        , processInstanceStatus, node.getCandidateStrategy(), node.getCandidateParam()));
-            }
-        } else {
-            nodeProgress.setStatus(BpmProcessNodeProgressEnum.FINISHED.getStatus()); // 默认设置成结束状态
-            HistoricActivityInstance historicActivity = activityInstanceMap.get(node.getId());
-            nodeProgress.setStartTime(DateUtils.of(historicActivity.getStartTime()));
-            nodeProgress.setEndTime(DateUtils.of(historicActivity.getEndTime()));
-            nodeProgress.setId(historicActivity.getId());
-            switch (nodeType) {
-                case START_USER_NODE: { // 发起人节点
-                    nodeProgress.setDisplayText(""); // 发起人节点不需要显示 displayText
-                    // 1. 设置节点的状态
-                    nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));
-                    // 2. 设置用户信息
-                    nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, false, historicActivityList));
-                    break;
-                }
-                case APPROVE_NODE: { // 审批节点
-                    if (USER.getType().equals(node.getApproveType())) { // 人工审批
-                        // 1. 判断是否多人审批
-                        boolean isMultiInstance = !RANDOM.getMethod().equals(node.getApproveMethod());
-                        // 2. 设置节点的状态
-                        nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, isMultiInstance, historicActivityList));
-                        // 3. 设置用户信息
-                        nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, isMultiInstance, historicActivityList));
-                    } else {
-                        nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));
-                    }
-                    break;
-                }
-                // TODO @芋艿：抄送节点，要不要跳过（不展示）
-                case COPY_NODE: { // 抄送节点
-                    // 1. 设置节点的状态
-                    nodeProgress.setStatus(activityService.getHistoricActivityProgressStatus(historicActivity, false, historicActivityList));
-                    // 2. 设置用户信息
-                    nodeProgress.setUserList(activityService.getHistoricActivityUserList(historicActivity, false, historicActivityList));
-                    break;
-                }
-
-                default: {
-                    // TODO 其它节点类型的实现
-                }
-            }
-        }
-        // 如果是“分支”节点，
-        if (BpmSimpleModelNodeType.isBranchNode(node.getType())
-                && ArrayUtil.isNotEmpty(node.getConditionNodes())) {
-            // 网关是否执行了， 执行了。只包含运行的分支。 未执行包含所有的分支
-            final boolean executed = activityInstanceMap.containsKey(node.getId());
-            LinkedList<ProcessNodeProgress> branchNodeList = new LinkedList<>();
-            node.getConditionNodes().forEach(item -> {
-                // 如果条件节点执行了。 ACT_HI_ACTINST 表会记录
-                if (executed) {
-                    if (activityInstanceMap.containsKey(item.getId())) {
-                        List<Integer> branchReturnNodePosition = new ArrayList<>();
-                        traverseNodeToBuildNodeProgress(processInstance, item, historicActivityList, activityInstanceMap, branchNodeList, branchReturnNodePosition);
-                        // TODO 处理回退节点
-                    }
-                } else {
-                    List<Integer> branchReturnNodePosition = new ArrayList<>();
-                    traverseNodeToBuildNodeProgress(processInstance, item, historicActivityList, activityInstanceMap, branchNodeList, branchReturnNodePosition);
-                    // TODO 处理回退节点
-                }
-            });
-            nodeProgress.setBranchNodes(branchNodeList);
-        }
-        nodeProgresses.add(nodeProgress);
-    }
-
 }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java
index a3c1a228e..be76c7013 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java
@@ -1,7 +1,5 @@
 package cn.iocoder.yudao.module.bpm.service.task;
 
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
 import org.flowable.engine.history.HistoricActivityInstance;
 
 import java.util.List;
@@ -29,52 +27,4 @@ public interface BpmActivityService {
      */
     List<HistoricActivityInstance> getHistoricActivityListByExecutionId(String executionId);
 
-    /**
-     * 获取活动的用户列表。
-     *
-     * 例如：抄送人列表、审批人列表
-     *
-     * @param historicActivity     活动
-     * @param isMultiInstance      是否多实例 (会签，或签 )
-     * @param historicActivityList 某个流程实例的所有活动列表
-     * @return 用户列表
-     */
-    List<BpmProcessInstanceProgressRespVO.User> getHistoricActivityUserList(HistoricActivityInstance historicActivity,
-                                                                            Boolean isMultiInstance,
-                                                                            List<HistoricActivityInstance> historicActivityList);
-
-    /**
-     * 获取活动的进度状态
-     *
-     * @param historicActivity     活动
-     * @param isMultiInstance      是否多实例 (会签，或签 )
-     * @param historicActivityList 某个流程实例的所有活动列表
-     * @return 活动的进度状态
-     */
-    Integer getHistoricActivityProgressStatus(HistoricActivityInstance historicActivity,
-                                              Boolean isMultiInstance,
-                                              List<HistoricActivityInstance> historicActivityList);
-
-    /**
-     * 获取未执行活动的进度状态
-     *
-     * @param processInstanceStatus 流程实例的状态 {@link BpmProcessInstanceStatusEnum}
-     * @return 活动的进度状态
-     */
-    Integer getNotRunActivityProgressStatus(Integer processInstanceStatus);
-
-    /**
-     * 获取未执行活动的用户列表
-     *
-     * @param processInstanceId 流程实例的编号
-     * @param processInstanceStatus 流程实例的状态 {@link BpmProcessInstanceStatusEnum}
-     * @param candidateStrategy 活动的候选人策略
-     * @param candidateParam  活动的候选人参数
-     * @return 用户列表
-     */
-    List<BpmProcessInstanceProgressRespVO.User> getNotRunActivityUserList(String processInstanceId,
-                                                                          Integer processInstanceStatus,
-                                                                          Integer candidateStrategy,
-                                                                          String candidateParam);
-
 }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
index b39d3e4d6..26da5ad0e 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
@@ -1,33 +1,13 @@
 package cn.iocoder.yudao.module.bpm.service.task;
 
-import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.NumberUtil;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.User;
-import cn.iocoder.yudao.module.bpm.enums.definition.BpmProcessNodeProgressEnum;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
-import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
-import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.engine.HistoryService;
 import org.flowable.engine.history.HistoricActivityInstance;
-import org.flowable.task.api.history.HistoricTaskInstance;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static cn.iocoder.yudao.module.bpm.enums.definition.BpmProcessNodeProgressEnum.*;
 
 
 /**
@@ -40,26 +20,8 @@ import static cn.iocoder.yudao.module.bpm.enums.definition.BpmProcessNodeProgres
 @Validated
 public class BpmActivityServiceImpl implements BpmActivityService {
 
-    /**
-     * 抄送节点活动类型
-     */
-    private static final String COPY_NODE_ACTIVITY_TYPE = "serviceTask";
-    /**
-     * 审批节点活动类型
-     */
-    private static final String APPROVE_NODE_ACTIVITY_TYPE = "userTask";
-
     @Resource
     private HistoryService historyService;
-    @Resource
-    @Lazy
-    private BpmTaskService bpmTaskService;
-    @Resource
-    private BpmProcessInstanceCopyService bpmProcessInstanceCopyService;
-    @Resource
-    private AdminUserApi adminUserApi;
-    @Resource
-    private BpmTaskCandidateInvoker bpmTaskCandidateInvoker;
 
     @Override
     public List<HistoricActivityInstance> getActivityListByProcessInstanceId(String processInstanceId) {
@@ -72,130 +34,4 @@ public class BpmActivityServiceImpl implements BpmActivityService {
         return historyService.createHistoricActivityInstanceQuery().executionId(executionId).list();
     }
 
-    // TODO @芋艿：重点在 review 下~
-    @Override
-    public List<User> getHistoricActivityUserList(HistoricActivityInstance historicActivity
-            , Boolean isMultiInstance, List<HistoricActivityInstance> historicActivityList) {
-        Assert.notNull(historicActivity, "historicActivity 不能为 null ");
-        List<User> returnUserList = Collections.emptyList();
-        if (COPY_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {
-            Set<Long> copyUserIds = bpmProcessInstanceCopyService.getCopyUserIds(historicActivity.getProcessInstanceId(),
-                    historicActivity.getActivityId());
-            List<AdminUserRespDTO> userList = adminUserApi.getUserList(copyUserIds);
-            returnUserList = CollectionUtils.convertList(userList, item -> {
-                User user = BeanUtils.toBean(item, User.class);
-                user.setProcessed(Boolean.TRUE);
-                return user;
-            });
-        } else if (APPROVE_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {
-            if (isMultiInstance) {  // 多人 (会签 、 或签） // TODO 依次审批可能要特殊处理一下
-                // 多个任务列表
-                List<HistoricActivityInstance> taskList = CollectionUtils.filterList(historicActivityList,
-                        item -> historicActivity.getActivityId().equals(item.getActivityId()));
-                List<Long> userIds = CollectionUtils.convertList(taskList, item -> NumberUtil.parseLong(item.getAssignee(), null));
-                List<String> taskIds = CollectionUtils.convertList(taskList, HistoricActivityInstance::getTaskId);
-                Map<Long, AdminUserRespDTO> adminUserMap = CollectionUtils.convertMap(adminUserApi.getUserList(userIds), AdminUserRespDTO::getId);
-                Map<String, HistoricTaskInstance> historicTaskInstanceMap = CollectionUtils.convertMap(bpmTaskService.getHistoricTasks(taskIds), HistoricTaskInstance::getId);
-                returnUserList = CollectionUtils.convertList(taskList, item -> {
-                    AdminUserRespDTO adminUser = adminUserMap.get(NumberUtil.parseLong(item.getAssignee(), null));
-                    User user = BeanUtils.toBean(adminUser, User.class);
-                    if (user != null) {
-                        HistoricTaskInstance taskInstance = historicTaskInstanceMap.get(item.getTaskId());
-                        if (taskInstance != null) {
-                            user.setProcessed(taskInstance.getEndTime() != null);
-                            user.setUserTaskStatus(FlowableUtils.getTaskStatus(taskInstance));
-                        }
-                    }
-                    return user;
-                });
-            } else {
-                AdminUserRespDTO adminUserResp = adminUserApi.getUser(Long.valueOf(historicActivity.getAssignee()));
-                if (adminUserResp != null) {
-                    User user = BeanUtils.toBean(adminUserResp, User.class);
-                    // TODO 需要处理加签
-                    // 查询任务状态
-                    HistoricTaskInstance historicTask = bpmTaskService.getHistoricTask(historicActivity.getTaskId());
-                    if (historicTask != null) {
-                        Integer taskStatus = FlowableUtils.getTaskStatus(historicTask);
-                        user.setProcessed(historicTask.getEndTime() != null);
-                        user.setUserTaskStatus(taskStatus);
-                    }
-                    returnUserList = ListUtil.of(user);
-                }
-            }
-        }
-        return returnUserList;
-    }
-
-    @Override
-    public Integer getHistoricActivityProgressStatus(HistoricActivityInstance historicActivity
-            , Boolean isMultiInstance, List<HistoricActivityInstance> historicActivityList) {
-        Assert.notNull(historicActivity, "historicActivity 不能为 null ");
-        Integer progressStatus = null;
-        if (APPROVE_NODE_ACTIVITY_TYPE.equals(historicActivity.getActivityType())) {
-            if (isMultiInstance) { // 多人 (会签 、 或签）
-                // 多个任务列表
-                List<HistoricActivityInstance> taskList = CollectionUtils.filterList(historicActivityList,
-                        item -> historicActivity.getActivityId().equals(item.getActivityId()));
-                List<String> taskIds = CollectionUtils.convertList(taskList, HistoricActivityInstance::getTaskId);
-                Map<String, HistoricTaskInstance> historicTaskMap = CollectionUtils.convertMap(bpmTaskService.getHistoricTasks(taskIds), HistoricTaskInstance::getId);
-                for (HistoricActivityInstance activity : taskList) {
-                    if (activity.getEndTime() == null) {
-                        progressStatus = RUNNING.getStatus();
-                    } else {
-                        HistoricTaskInstance task = historicTaskMap.get(activity.getTaskId());
-                        if (task != null) {
-                            Integer taskStatus = FlowableUtils.getTaskStatus(task);
-                            progressStatus = BpmProcessNodeProgressEnum.convertBpmnTaskStatus(taskStatus);
-                        }
-                    }
-                    // 运行中或者未通过状态。退出循环 (会签可能需要多人通过）
-                    if (RUNNING.getStatus().equals(progressStatus) || isUserTaskNotApproved(progressStatus)) {
-                        break;
-                    }
-                }
-            } else {
-                HistoricTaskInstance historicTask = bpmTaskService.getHistoricTask(historicActivity.getTaskId());
-                if (historicTask != null) {
-                    Integer taskStatus = FlowableUtils.getTaskStatus(historicTask);
-                    progressStatus = BpmProcessNodeProgressEnum.convertBpmnTaskStatus(taskStatus);
-                }
-            }
-        } else {
-            if (historicActivity.getEndTime() == null) {
-                progressStatus = RUNNING.getStatus();
-            }else {
-                progressStatus = BpmProcessNodeProgressEnum.FINISHED.getStatus();
-            }
-
-        }
-        return progressStatus;
-    }
-
-    @Override
-    public Integer getNotRunActivityProgressStatus(Integer processInstanceStatus) {
-        if(BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)){
-            return SKIP.getStatus();
-        }else {
-            return NOT_START.getStatus();
-        }
-    }
-
-    @Override
-    public List<User> getNotRunActivityUserList(String processInstanceId, Integer processInstanceStatus, Integer candidateStrategy, String candidateParam) {
-        if(BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)){
-            // 跳过节点。返回空
-            return Collections.emptyList();
-        }else {
-            BpmTaskCandidateStrategy taskCandidateStrategy = bpmTaskCandidateInvoker.getCandidateStrategy(candidateStrategy);
-            Set<Long> userIds = taskCandidateStrategy.calculateUsers(processInstanceId, candidateParam);
-            List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIds);
-            return CollectionUtils.convertList(userList, item -> {
-                User user = BeanUtils.toBean(item, User.class);
-                user.setProcessed(Boolean.FALSE);
-                return user;
-            });
-        }
-    }
-
 }
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
index be01e0018..ada5c2d87 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
@@ -1 +1 @@
-package cn.iocoder.yudao.module.bpm.service.task;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.common.util.object.PageUtils;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
import cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.BpmTaskCandidateStartUserSelectStrategy;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.event.BpmProcessInstanceEventPublisher;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.SimpleModelUtils;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.util.*;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ProcessNodeProgress;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;

/**
 * 流程实例 Service 实现类
 * <p>
 * ProcessDefinition & ProcessInstance & Execution & Task 的关系：
 * 1. <a href="https://blog.csdn.net/bobozai86/article/details/105210414" />
 * <p>
 * HistoricProcessInstance & ProcessInstance 的关系：
 * 1. <a href=" https://my.oschina.net/843294669/blog/71902" />
 * <p>
 * 简单来说，前者 = 历史 + 运行中的流程实例，后者仅是运行中的流程实例
 *
 * @author 芋道源码
 */
@Service
@Validated
@Slf4j
public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService {

    @Resource
    private RuntimeService runtimeService;
    @Resource
    private HistoryService historyService;
    @Resource
    private BpmActivityService activityService;
    @Resource
    private BpmProcessDefinitionService processDefinitionService;
    @Resource
    @Lazy // 避免循环依赖
    private BpmTaskService taskService;
    @Resource
    private BpmMessageService messageService;

    @Resource
    private AdminUserApi adminUserApi;

    @Resource
    private BpmProcessInstanceEventPublisher processInstanceEventPublisher;

    // ========== Query 查询相关方法 ==========

    @Override
    public ProcessInstance getProcessInstance(String id) {
        return runtimeService.createProcessInstanceQuery()
                .includeProcessVariables()
                .processInstanceId(id)
                .singleResult();
    }

    @Override
    public List<ProcessInstance> getProcessInstances(Set<String> ids) {
        return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list();
    }

    @Override
    public HistoricProcessInstance getHistoricProcessInstance(String id) {
        return historyService.createHistoricProcessInstanceQuery().processInstanceId(id).includeProcessVariables().singleResult();
    }

    @Override
    public List<HistoricProcessInstance> getHistoricProcessInstances(Set<String> ids) {
        return historyService.createHistoricProcessInstanceQuery().processInstanceIds(ids).list();
    }

    @Override
    public PageResult<HistoricProcessInstance> getProcessInstancePage(Long userId,
                                                                      BpmProcessInstancePageReqVO pageReqVO) {
        // 通过 BpmProcessInstanceExtDO 表，先查询到对应的分页
        HistoricProcessInstanceQuery processInstanceQuery = historyService.createHistoricProcessInstanceQuery()
                .includeProcessVariables()
                .processInstanceTenantId(FlowableUtils.getTenantId())
                .orderByProcessInstanceStartTime().desc();
        if (userId != null) { // 【我的流程】菜单时，需要传递该字段
            processInstanceQuery.startedBy(String.valueOf(userId));
        } else if (pageReqVO.getStartUserId() != null) { // 【管理流程】菜单时，才会传递该字段
            processInstanceQuery.startedBy(String.valueOf(pageReqVO.getStartUserId()));
        }
        if (StrUtil.isNotEmpty(pageReqVO.getName())) {
            processInstanceQuery.processInstanceNameLike("%" + pageReqVO.getName() + "%");
        }
        if (StrUtil.isNotEmpty(pageReqVO.getProcessDefinitionId())) {
            processInstanceQuery.processDefinitionId("%" + pageReqVO.getProcessDefinitionId() + "%");
        }
        if (StrUtil.isNotEmpty(pageReqVO.getCategory())) {
            processInstanceQuery.processDefinitionCategory(pageReqVO.getCategory());
        }
        if (pageReqVO.getStatus() != null) {
            processInstanceQuery.variableValueEquals(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, pageReqVO.getStatus());
        }
        if (ArrayUtil.isNotEmpty(pageReqVO.getCreateTime())) {
            processInstanceQuery.startedAfter(DateUtils.of(pageReqVO.getCreateTime()[0]));
            processInstanceQuery.startedBefore(DateUtils.of(pageReqVO.getCreateTime()[1]));
        }
        // 查询数量
        long processInstanceCount = processInstanceQuery.count();
        if (processInstanceCount == 0) {
            return PageResult.empty(processInstanceCount);
        }
        // 查询列表
        List<HistoricProcessInstance> processInstanceList = processInstanceQuery.listPage(PageUtils.getStart(pageReqVO), pageReqVO.getPageSize());
        return new PageResult<>(processInstanceList, processInstanceCount);
    }

    @Override
    public Map<String, String> getProcessInstanceFormFieldsPermission(BpmProcessInstanceFormFieldsPermissionReqVO reqVO) {
        HistoricProcessInstance processInstance = getHistoricProcessInstance(reqVO.getId());
        // 1.1 查询流程实例. 不存在返回 null
        if (processInstance == null) {
            return null;
        }
        // 1.2 通过流程活动编号
        String activityId = reqVO.getActivityId();
        if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(reqVO.getTaskId())) { // 流程活动 Id 为空。从流程任务中获取流程活动 Id
            activityId = Optional.ofNullable(taskService.getHistoricTask(reqVO.getTaskId()))
                    .map(HistoricTaskInstance::getTaskDefinitionKey).orElse(null);
        }
        if (StrUtil.isEmpty(activityId)) {
            return null;
        }

        // 2. 从 BpmnModel 中解析表单字段权限
        return BpmnModelUtils.parseFormFieldsPermission(
                processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()), activityId);
    }

    @Override
    public BpmProcessInstanceProgressRespVO getProcessInstanceProgress(String id) {
        HistoricProcessInstance processInstance = getHistoricProcessInstance(id);
        if (processInstance == null) {
            return null;
        }
        BpmProcessInstanceProgressRespVO respVO = new BpmProcessInstanceProgressRespVO()
                .setStatus(FlowableUtils.getProcessInstanceStatus(processInstance));
        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(
                processInstance.getProcessDefinitionId());
        List<HistoricActivityInstance> historicActivityList = activityService.getActivityListByProcessInstanceId(
                processInstance.getId());
        //
        if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) { // 仿钉钉流程设计器
            BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class);
            List<ProcessNodeProgress> nodeProgresses = new LinkedList<>();
            Map<String, HistoricActivityInstance> activityInstanceMap = CollectionUtils.convertMap(historicActivityList, HistoricActivityInstance::getActivityId);
            // TODO 回退节点需要处理。
            List<Integer> returnNodePosition = new ArrayList<>();
            SimpleModelUtils.traverseNodeToBuildNodeProgress(processInstance, simpleModel, historicActivityList,
                    activityInstanceMap, nodeProgresses, returnNodePosition);
            respVO.setNodeProgressList(nodeProgresses);
        } else if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) {
            // TODO 待实现
        }
        return respVO;
    }


    // ========== Update 写入相关方法 ==========

    @Override
    @Transactional(rollbackFor = Exception.class)
    public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) {
        // 获得流程定义
        ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId());
        // 发起流程
        return createProcessInstance0(userId, definition, createReqVO.getVariables(), null,
                createReqVO.getStartUserSelectAssignees());
    }

    @Override
    public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) {
        // 获得流程定义
        ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey());
        // 发起流程
        return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(),
                createReqDTO.getStartUserSelectAssignees());
    }

    private String createProcessInstance0(Long userId, ProcessDefinition definition,
                                          Map<String, Object> variables, String businessKey,
                                          Map<String, List<Long>> startUserSelectAssignees) {
        // 1.1 校验流程定义
        if (definition == null) {
            throw exception(PROCESS_DEFINITION_NOT_EXISTS);
        }
        if (definition.isSuspended()) {
            throw exception(PROCESS_DEFINITION_IS_SUSPENDED);
        }
        // 1.2 校验发起人自选审批人
        validateStartUserSelectAssignees(definition, startUserSelectAssignees);

        // 2. 创建流程实例
        if (variables == null) {
            variables = new HashMap<>();
        }
        FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下，避免 ProcessInstance 系统级的变量被占用
        variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, // 流程实例状态：审批中
                BpmProcessInstanceStatusEnum.RUNNING.getStatus());
        if (CollUtil.isNotEmpty(startUserSelectAssignees)) {
            variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees);
        }
        ProcessInstance instance = runtimeService.createProcessInstanceBuilder()
                .processDefinitionId(definition.getId())
                .businessKey(businessKey)
                .name(definition.getName().trim())
                .variables(variables)
                .start();
        return instance.getId();
    }

    private void validateStartUserSelectAssignees(ProcessDefinition definition, Map<String, List<Long>> startUserSelectAssignees) {
        // 1. 获得发起人自选审批人的 UserTask 列表
        BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId());
        List<UserTask> userTaskList = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectUserTaskList(bpmnModel);
        if (CollUtil.isEmpty(userTaskList)) {
            return;
        }

        // 2. 校验发起人自选审批人的 UserTask 是否都配置了
        userTaskList.forEach(userTask -> {
            List<Long> assignees = startUserSelectAssignees != null ? startUserSelectAssignees.get(userTask.getId()) : null;
            if (CollUtil.isEmpty(assignees)) {
                throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, userTask.getName());
            }
            Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(assignees);
            assignees.forEach(assignee -> {
                if (userMap.get(assignee) == null) {
                    throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS, userTask.getName(), assignee);
                }
            });
        });
    }

    @Override
    public void cancelProcessInstanceByStartUser(Long userId, @Valid BpmProcessInstanceCancelReqVO cancelReqVO) {
        // 1.1 校验流程实例存在
        ProcessInstance instance = getProcessInstance(cancelReqVO.getId());
        if (instance == null) {
            throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS);
        }
        // 1.2 只能取消自己的
        if (!Objects.equals(instance.getStartUserId(), String.valueOf(userId))) {
            throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF);
        }

        // 2. 取消流程
        updateProcessInstanceCancel(cancelReqVO.getId(),
                BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_START_USER.format(cancelReqVO.getReason()));
    }

    @Override
    public void cancelProcessInstanceByAdmin(Long userId, BpmProcessInstanceCancelReqVO cancelReqVO) {
        // 1.1 校验流程实例存在
        ProcessInstance instance = getProcessInstance(cancelReqVO.getId());
        if (instance == null) {
            throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS);
        }

        // 2. 取消流程
        AdminUserRespDTO user = adminUserApi.getUser(userId);
        updateProcessInstanceCancel(cancelReqVO.getId(),
                BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_ADMIN.format(user.getNickname(), cancelReqVO.getReason()));
    }

    private void updateProcessInstanceCancel(String id, String reason) {
        // 1. 更新流程实例 status
        runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,
                BpmProcessInstanceStatusEnum.CANCEL.getStatus());
        runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, reason);

        // 2. 结束流程
        taskService.moveTaskToEnd(id);
    }

    @Override
    public void updateProcessInstanceReject(ProcessInstance processInstance, String reason) {
        runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,
                BpmProcessInstanceStatusEnum.REJECT.getStatus());
        runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON,
                BpmReasonEnum.REJECT_TASK.format(reason));
    }

    // ========== Event 事件相关方法 ==========

    @Override
    public void processProcessInstanceCompleted(ProcessInstance instance) {
        // 注意：需要基于 instance 设置租户编号，避免 Flowable 内部异步时，丢失租户编号
        FlowableUtils.execute(instance.getTenantId(), () -> {
            // 1.1 获取当前状态
            Integer status = (Integer) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS);
            String reason = (String) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON);
            // 1.2 当流程状态还是审批状态中，说明审批通过了，则变更下它的状态
            // 为什么这么处理？因为流程完成，并且完成了，说明审批通过了
            if (Objects.equals(status, BpmProcessInstanceStatusEnum.RUNNING.getStatus())) {
                status = BpmProcessInstanceStatusEnum.APPROVE.getStatus();
                runtimeService.setVariable(instance.getId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, status);
            }

            // 2. 发送对应的消息通知
            if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
                messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance));
            } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) {
                messageService.sendMessageWhenProcessInstanceReject(
                        BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceRejectMessage(instance, reason));
            }

            // 3. 发送流程实例的状态事件
            processInstanceEventPublisher.sendProcessInstanceResultEvent(
                    BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, instance, status));
        });
    }

}
\ No newline at end of file
+package cn.iocoder.yudao.module.bpm.service.task;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.object.PageUtils;
import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.simple.BpmSimpleModelNodeVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ApproveTaskInfo;
import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelTypeEnum;
import cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
import cn.iocoder.yudao.module.bpm.enums.task.BpmReasonEnum;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateInvoker;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.BpmTaskCandidateStrategy;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.candidate.strategy.BpmTaskCandidateStartUserSelectStrategy;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnVariableConstants;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.event.BpmProcessInstanceEventPublisher;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.BpmnModelUtils;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.FlowableUtils;
import cn.iocoder.yudao.module.bpm.framework.flowable.core.util.SimpleModelUtils;
import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
import cn.iocoder.yudao.module.bpm.service.task.bo.AlreadyRunApproveNodeRespBO;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.HistoryService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricActivityInstance;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import java.util.*;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ApproveNodeInfo;
import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.User;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.bpm.enums.definition.BpmSimpleModelNodeType.*;
import static cn.iocoder.yudao.module.bpm.enums.definition.BpmUserTaskApproveTypeEnum.USER;
import static cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum.APPROVE;
import static cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum.NOT_START;
import static cn.iocoder.yudao.module.bpm.framework.flowable.core.enums.BpmnModelConstants.START_USER_NODE_ID;

/**
 * 流程实例 Service 实现类
 * <p>
 * ProcessDefinition & ProcessInstance & Execution & Task 的关系：
 * 1. <a href="https://blog.csdn.net/bobozai86/article/details/105210414" />
 * <p>
 * HistoricProcessInstance & ProcessInstance 的关系：
 * 1. <a href=" https://my.oschina.net/843294669/blog/71902" />
 * <p>
 * 简单来说，前者 = 历史 + 运行中的流程实例，后者仅是运行中的流程实例
 *
 * @author 芋道源码
 */
@Service
@Validated
@Slf4j
public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService {

    @Resource
    private RuntimeService runtimeService;
    @Resource
    private HistoryService historyService;
    @Resource
    private BpmActivityService activityService;
    @Resource
    private BpmProcessDefinitionService processDefinitionService;
    @Resource
    @Lazy // 避免循环依赖
    private BpmTaskService taskService;
    @Resource
    private BpmMessageService messageService;
    @Resource
    private BpmTaskCandidateInvoker bpmTaskCandidateInvoker;

    @Resource
    private AdminUserApi adminUserApi;

    @Resource
    private BpmProcessInstanceEventPublisher processInstanceEventPublisher;

    // ========== Query 查询相关方法 ==========

    @Override
    public ProcessInstance getProcessInstance(String id) {
        return runtimeService.createProcessInstanceQuery()
                .includeProcessVariables()
                .processInstanceId(id)
                .singleResult();
    }

    @Override
    public List<ProcessInstance> getProcessInstances(Set<String> ids) {
        return runtimeService.createProcessInstanceQuery().processInstanceIds(ids).list();
    }

    @Override
    public HistoricProcessInstance getHistoricProcessInstance(String id) {
        return historyService.createHistoricProcessInstanceQuery().processInstanceId(id).includeProcessVariables().singleResult();
    }

    @Override
    public List<HistoricProcessInstance> getHistoricProcessInstances(Set<String> ids) {
        return historyService.createHistoricProcessInstanceQuery().processInstanceIds(ids).list();
    }

    @Override
    public PageResult<HistoricProcessInstance> getProcessInstancePage(Long userId,
                                                                      BpmProcessInstancePageReqVO pageReqVO) {
        // 通过 BpmProcessInstanceExtDO 表，先查询到对应的分页
        HistoricProcessInstanceQuery processInstanceQuery = historyService.createHistoricProcessInstanceQuery()
                .includeProcessVariables()
                .processInstanceTenantId(FlowableUtils.getTenantId())
                .orderByProcessInstanceStartTime().desc();
        if (userId != null) { // 【我的流程】菜单时，需要传递该字段
            processInstanceQuery.startedBy(String.valueOf(userId));
        } else if (pageReqVO.getStartUserId() != null) { // 【管理流程】菜单时，才会传递该字段
            processInstanceQuery.startedBy(String.valueOf(pageReqVO.getStartUserId()));
        }
        if (StrUtil.isNotEmpty(pageReqVO.getName())) {
            processInstanceQuery.processInstanceNameLike("%" + pageReqVO.getName() + "%");
        }
        if (StrUtil.isNotEmpty(pageReqVO.getProcessDefinitionId())) {
            processInstanceQuery.processDefinitionId("%" + pageReqVO.getProcessDefinitionId() + "%");
        }
        if (StrUtil.isNotEmpty(pageReqVO.getCategory())) {
            processInstanceQuery.processDefinitionCategory(pageReqVO.getCategory());
        }
        if (pageReqVO.getStatus() != null) {
            processInstanceQuery.variableValueEquals(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, pageReqVO.getStatus());
        }
        if (ArrayUtil.isNotEmpty(pageReqVO.getCreateTime())) {
            processInstanceQuery.startedAfter(DateUtils.of(pageReqVO.getCreateTime()[0]));
            processInstanceQuery.startedBefore(DateUtils.of(pageReqVO.getCreateTime()[1]));
        }
        // 查询数量
        long processInstanceCount = processInstanceQuery.count();
        if (processInstanceCount == 0) {
            return PageResult.empty(processInstanceCount);
        }
        // 查询列表
        List<HistoricProcessInstance> processInstanceList = processInstanceQuery.listPage(PageUtils.getStart(pageReqVO), pageReqVO.getPageSize());
        return new PageResult<>(processInstanceList, processInstanceCount);
    }

    @Override
    public Map<String, String> getProcessInstanceFormFieldsPermission(BpmProcessInstanceFormFieldsPermissionReqVO reqVO) {
        HistoricProcessInstance processInstance = getHistoricProcessInstance(reqVO.getId());
        // 1.1 查询流程实例. 不存在返回 null
        if (processInstance == null) {
            return null;
        }
        // 1.2 通过流程活动编号
        String activityId = reqVO.getActivityId();
        if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(reqVO.getTaskId())) { // 流程活动 Id 为空。从流程任务中获取流程活动 Id
            activityId = Optional.ofNullable(taskService.getHistoricTask(reqVO.getTaskId()))
                    .map(HistoricTaskInstance::getTaskDefinitionKey).orElse(null);
        }
        if (StrUtil.isEmpty(activityId)) {
            return null;
        }

        // 2. 从 BpmnModel 中解析表单字段权限
        return BpmnModelUtils.parseFormFieldsPermission(
                processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId()), activityId);
    }

    @Override
    public BpmProcessInstanceProgressRespVO getProcessInstanceProgress(String id) {
        // 1. 获取流程实例信息
        HistoricProcessInstance processInstance = getHistoricProcessInstance(id);
        if (processInstance == null) {
            return null;
        }
        // 2. 获取流程实例状态
        Integer processInstanceStatus = FlowableUtils.getProcessInstanceStatus(processInstance);
        BpmProcessInstanceProgressRespVO respVO = new BpmProcessInstanceProgressRespVO()
                .setStatus(processInstanceStatus);

        // 3. 构建已运行节点的审批信息
        List<HistoricActivityInstance> historicActivityList = activityService.getActivityListByProcessInstanceId(
                processInstance.getId());
        AlreadyRunApproveNodeRespBO respBO = buildAlreadyRunApproveNodes(processInstance.getId(), historicActivityList);

        if (BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)) { // 流程已经结束
            respVO.setApproveNodeList(respBO.getApproveNodeList());
        } else {
            // 区分 BPMN 设计器 和 SIMPLE 设计器
            BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(
                    processInstance.getProcessDefinitionId());
            if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) {
                // 4.1 仿钉钉流程设计器， 构建未运行节点的审批信息
                List<ApproveNodeInfo> approveNodeList = respBO.getApproveNodeList();
                BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class);
                List<ApproveNodeInfo> notRunApproveNodes = new ArrayList<>();
                traverseSimpleModelNodeToBuildNotRunApproveNodes(processInstance.getId(), simpleModel, respBO.getRunNodeIds(), notRunApproveNodes);
                approveNodeList.addAll(notRunApproveNodes);
                respVO.setApproveNodeList(approveNodeList);
            } else if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) {
                // TODO Bpmn 设计器， 构建未运行节点的审批信息
                respVO.setApproveNodeList(respBO.getApproveNodeList());
            }
        }

        return respVO;
    }

    /**
     *  遍历 SIMPLE 设计器模型 构建未运行节点的审批信息
     *
     * @param processInstanceId 流程实例 Id
     * @param simpleModelNode  SIMPLE 设计器模型
     * @param runNodeIds 已经运行节点的 Ids
     * @param approveNodeList 未运行节点的审批信息列表
     */
    private void traverseSimpleModelNodeToBuildNotRunApproveNodes(String processInstanceId, BpmSimpleModelNodeVO simpleModelNode
            , Set<String> runNodeIds, List<ApproveNodeInfo> approveNodeList) {
        if (!SimpleModelUtils.isValidNode(simpleModelNode)) {
            return;
        }
        buildNotRunApproveNodes(processInstanceId, simpleModelNode, runNodeIds, approveNodeList);
        // 如果有子节点递归遍历子节点
        traverseSimpleModelNodeToBuildNotRunApproveNodes(processInstanceId, simpleModelNode.getChildNode(), runNodeIds, approveNodeList);
    }

    private void buildNotRunApproveNodes(String processInstanceId, BpmSimpleModelNodeVO node, Set<String> runNodeIds, List<ApproveNodeInfo> approveNodeList) {
        if (!runNodeIds.contains(node.getId())) {
            // 节点未运行。需要进行预测
            // 1. 对需要人工审批的审批节点。进行预测
            if (APPROVE_NODE.getType().equals(node.getType()) && USER.getType().equals(node.getApproveType())) {
                ApproveNodeInfo nodeProgress = new ApproveNodeInfo();
                nodeProgress.setNodeType(node.getType());
                nodeProgress.setName(node.getName());
                nodeProgress.setStatus(NOT_START.getStatus());
                nodeProgress.setCandidateUserList(getNotRunTaskCandidateUserList(processInstanceId, node.getCandidateStrategy(), node.getCandidateParam()));
                approveNodeList.add(nodeProgress);
            }
            // 2. 对分支节点进行预测
            if (BpmSimpleModelNodeType.isBranchNode(node.getType())) {
                //  并行分支。不用预测条件。所有分支都需要遍历
                if (PARALLEL_BRANCH_NODE.getType().equals(node.getType())) {
                    node.getConditionNodes().forEach(conditionNode ->
                            traverseSimpleModelNodeToBuildNotRunApproveNodes(processInstanceId, conditionNode.getChildNode()
                                    , runNodeIds, approveNodeList)
                    );
                }
                // TODO 条件分支如何预测待研究
            }
            // 3. 结束节点
            if (END_NODE.getType().equals(node.getType())) {
                ApproveNodeInfo nodeProgress = new ApproveNodeInfo();
                nodeProgress.setNodeType(node.getType());
                nodeProgress.setName(node.getName());
                nodeProgress.setStatus(NOT_START.getStatus());
                approveNodeList.add(nodeProgress);
            }

        } else {
            // 节点已经运行。如果是分支节点。需要检查分支节点的运行情况
            if (BpmSimpleModelNodeType.isBranchNode(node.getType()) && ArrayUtil.isNotEmpty(node.getConditionNodes())) {
                node.getConditionNodes().forEach(conditionNode -> {
                    // 只有运行的条件，才需要遍历
                    if (runNodeIds.contains(conditionNode.getId())) {
                        traverseSimpleModelNodeToBuildNotRunApproveNodes(processInstanceId, conditionNode.getChildNode()
                                , runNodeIds, approveNodeList);
                    }
                });
            }
        }
    }

    /**
     * 从已经运行活动节点构建的审批信息列表
     *
     * @param processInstanceId  流程实例 Id
     * @param historicActivityList 已经运行活动
     */
    private AlreadyRunApproveNodeRespBO buildAlreadyRunApproveNodes(String processInstanceId,
                                                                    List<HistoricActivityInstance> historicActivityList) {
        // 待处理活动  只有 "userTask"  和 "endEvent"。 活动需要处理
        List<HistoricActivityInstance> pendingActivityNodes = new ArrayList<>();
        // 运行的节点 activityId。
        Set<String> runNodeIds = new HashSet<>();
        // 1. 遍历所有已运行和运行中的活动。 获取待处理的活动
        historicActivityList.forEach(activity -> {
            runNodeIds.add(activity.getActivityId());
            if (BpmSimpleModelNodeType.isRecordNode(activity.getActivityType())) {
                pendingActivityNodes.add(activity);
            }
        });
        // 2.1 获取已运行和运行中的任务
        List<HistoricTaskInstance> taskList = taskService.getTaskListByProcessInstanceId(processInstanceId);
        Map<String, HistoricTaskInstance> taskMap = CollectionUtils.convertMap(taskList, HistoricTaskInstance::getId);
        // 2.2 获取加签的任务
        Map<String, List<HistoricTaskInstance>> addSignTaskMap = CollectionUtils.convertMultiMap(
                CollectionUtils.filterList(taskList, task -> StrUtil.isNotEmpty(task.getParentTaskId())), HistoricTaskInstance::getParentTaskId);
        // 3. 转换为节点审批信息
        List<ApproveNodeInfo> nodeProgressList = CollectionUtils.convertList(pendingActivityNodes, activity -> {
            ApproveNodeInfo nodeProgress = new ApproveNodeInfo().setName(activity.getActivityName())
                    .setId(activity.getId())
                    .setStartTime(DateUtils.of(activity.getStartTime()))
                    .setEndTime(DateUtils.of(activity.getEndTime()));
            if (BPMN_USER_TASK_TYPE.equals(activity.getActivityType())) { // 用户任务
                if (START_USER_NODE_ID.equals(activity.getActivityId())) {
                    nodeProgress.setNodeType(START_USER_NODE.getType());
                } else {
                    nodeProgress.setNodeType(APPROVE_NODE.getType());
                }
                HistoricTaskInstance task = taskMap.get(activity.getTaskId());
                nodeProgress.setStatus(FlowableUtils.getTaskStatus(task));
                ApproveTaskInfo approveTask = convertApproveTaskInfo(task);
                List<ApproveTaskInfo> approveTasks = CollUtil.newArrayList(approveTask);
                // 处理加签任务
                List<HistoricTaskInstance> addSignTasks = addSignTaskMap.get(activity.getTaskId());
                if (CollUtil.isNotEmpty(addSignTasks)) {
                    approveTasks.addAll(CollectionUtils.convertList(addSignTasks, this::convertApproveTaskInfo));
                }
                nodeProgress.setTasks(approveTasks);
            } else if (END_NODE.getBpmnType().equals(activity.getActivityType())) {
                nodeProgress.setNodeType(APPROVE_NODE.getType());
                nodeProgress.setStatus(APPROVE.getStatus());
            }
            return nodeProgress;
        });
        return new AlreadyRunApproveNodeRespBO()
                .setApproveNodeList(nodeProgressList)
                .setRunNodeIds(runNodeIds);

    }

    private ApproveTaskInfo convertApproveTaskInfo(HistoricTaskInstance task) {
        if (task == null) {
            return null;
        }
        ApproveTaskInfo approveTask = BeanUtils.toBean(task, ApproveTaskInfo.class);
        approveTask.setStatus(FlowableUtils.getTaskStatus(task));
        approveTask.setReason(FlowableUtils.getTaskReason(task));
        if (StrUtil.isNotEmpty(task.getAssignee())) {
            AdminUserRespDTO adminUserResp = adminUserApi.getUser(NumberUtil.parseLong(task.getAssignee()));
            approveTask.setAssigneeUser(BeanUtils.toBean(adminUserResp, User.class));
        }
        if (StrUtil.isNotEmpty(task.getOwner())) {
            AdminUserRespDTO adminUserResp = adminUserApi.getUser(NumberUtil.parseLong(task.getOwner()));
            approveTask.setOwnerUser(BeanUtils.toBean(adminUserResp, User.class));
        }
        return approveTask;
    }

    private List<User> getNotRunTaskCandidateUserList(String processInstanceId, Integer candidateStrategy,
                                                      String candidateParam) {
        BpmTaskCandidateStrategy taskCandidateStrategy = bpmTaskCandidateInvoker.getCandidateStrategy(candidateStrategy);
        Set<Long> userIds = taskCandidateStrategy.calculateUsers(processInstanceId, candidateParam);
        List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIds);
        return CollectionUtils.convertList(userList, item -> BeanUtils.toBean(item, User.class));
    }

    // ========== Update 写入相关方法 ==========

    @Override
    @Transactional(rollbackFor = Exception.class)
    public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) {
        // 获得流程定义
        ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId());
        // 发起流程
        return createProcessInstance0(userId, definition, createReqVO.getVariables(), null,
                createReqVO.getStartUserSelectAssignees());
    }

    @Override
    public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) {
        // 获得流程定义
        ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey());
        // 发起流程
        return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(),
                createReqDTO.getStartUserSelectAssignees());
    }

    private String createProcessInstance0(Long userId, ProcessDefinition definition,
                                          Map<String, Object> variables, String businessKey,
                                          Map<String, List<Long>> startUserSelectAssignees) {
        // 1.1 校验流程定义
        if (definition == null) {
            throw exception(PROCESS_DEFINITION_NOT_EXISTS);
        }
        if (definition.isSuspended()) {
            throw exception(PROCESS_DEFINITION_IS_SUSPENDED);
        }
        // 1.2 校验发起人自选审批人
        validateStartUserSelectAssignees(definition, startUserSelectAssignees);

        // 2. 创建流程实例
        if (variables == null) {
            variables = new HashMap<>();
        }
        FlowableUtils.filterProcessInstanceFormVariable(variables); // 过滤一下，避免 ProcessInstance 系统级的变量被占用
        variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, // 流程实例状态：审批中
                BpmProcessInstanceStatusEnum.RUNNING.getStatus());
        if (CollUtil.isNotEmpty(startUserSelectAssignees)) {
            variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees);
        }
        ProcessInstance instance = runtimeService.createProcessInstanceBuilder()
                .processDefinitionId(definition.getId())
                .businessKey(businessKey)
                .name(definition.getName().trim())
                .variables(variables)
                .start();
        return instance.getId();
    }

    private void validateStartUserSelectAssignees(ProcessDefinition definition, Map<String, List<Long>> startUserSelectAssignees) {
        // 1. 获得发起人自选审批人的 UserTask 列表
        BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId());
        List<UserTask> userTaskList = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectUserTaskList(bpmnModel);
        if (CollUtil.isEmpty(userTaskList)) {
            return;
        }

        // 2. 校验发起人自选审批人的 UserTask 是否都配置了
        userTaskList.forEach(userTask -> {
            List<Long> assignees = startUserSelectAssignees != null ? startUserSelectAssignees.get(userTask.getId()) : null;
            if (CollUtil.isEmpty(assignees)) {
                throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_CONFIG, userTask.getName());
            }
            Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(assignees);
            assignees.forEach(assignee -> {
                if (userMap.get(assignee) == null) {
                    throw exception(PROCESS_INSTANCE_START_USER_SELECT_ASSIGNEES_NOT_EXISTS, userTask.getName(), assignee);
                }
            });
        });
    }

    @Override
    public void cancelProcessInstanceByStartUser(Long userId, @Valid BpmProcessInstanceCancelReqVO cancelReqVO) {
        // 1.1 校验流程实例存在
        ProcessInstance instance = getProcessInstance(cancelReqVO.getId());
        if (instance == null) {
            throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS);
        }
        // 1.2 只能取消自己的
        if (!Objects.equals(instance.getStartUserId(), String.valueOf(userId))) {
            throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF);
        }

        // 2. 取消流程
        updateProcessInstanceCancel(cancelReqVO.getId(),
                BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_START_USER.format(cancelReqVO.getReason()));
    }

    @Override
    public void cancelProcessInstanceByAdmin(Long userId, BpmProcessInstanceCancelReqVO cancelReqVO) {
        // 1.1 校验流程实例存在
        ProcessInstance instance = getProcessInstance(cancelReqVO.getId());
        if (instance == null) {
            throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_EXISTS);
        }

        // 2. 取消流程
        AdminUserRespDTO user = adminUserApi.getUser(userId);
        updateProcessInstanceCancel(cancelReqVO.getId(),
                BpmReasonEnum.CANCEL_PROCESS_INSTANCE_BY_ADMIN.format(user.getNickname(), cancelReqVO.getReason()));
    }

    private void updateProcessInstanceCancel(String id, String reason) {
        // 1. 更新流程实例 status
        runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,
                BpmProcessInstanceStatusEnum.CANCEL.getStatus());
        runtimeService.setVariable(id, BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON, reason);

        // 2. 结束流程
        taskService.moveTaskToEnd(id);
    }

    @Override
    public void updateProcessInstanceReject(ProcessInstance processInstance, String reason) {
        runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,
                BpmProcessInstanceStatusEnum.REJECT.getStatus());
        runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON,
                BpmReasonEnum.REJECT_TASK.format(reason));
    }

    // ========== Event 事件相关方法 ==========

    @Override
    public void processProcessInstanceCompleted(ProcessInstance instance) {
        // 注意：需要基于 instance 设置租户编号，避免 Flowable 内部异步时，丢失租户编号
        FlowableUtils.execute(instance.getTenantId(), () -> {
            // 1.1 获取当前状态
            Integer status = (Integer) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS);
            String reason = (String) instance.getProcessVariables().get(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON);
            // 1.2 当流程状态还是审批状态中，说明审批通过了，则变更下它的状态
            // 为什么这么处理？因为流程完成，并且完成了，说明审批通过了
            if (Objects.equals(status, BpmProcessInstanceStatusEnum.RUNNING.getStatus())) {
                status = BpmProcessInstanceStatusEnum.APPROVE.getStatus();
                runtimeService.setVariable(instance.getId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, status);
            }

            // 2. 发送对应的消息通知
            if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
                messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance));
            } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) {
                messageService.sendMessageWhenProcessInstanceReject(
                        BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceRejectMessage(instance, reason));
            }

            // 3. 发送流程实例的状态事件
            processInstanceEventPublisher.sendProcessInstanceResultEvent(
                    BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceStatusEvent(this, instance, status));
        });
    }

}
\ No newline at end of file
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/bo/AlreadyRunApproveNodeRespBO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/bo/AlreadyRunApproveNodeRespBO.java
new file mode 100644
index 000000000..ddffec22c
--- /dev/null
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/bo/AlreadyRunApproveNodeRespBO.java
@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.bpm.service.task.bo;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Set;
+
+import static cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceProgressRespVO.ApproveNodeInfo;
+
+/**
+ * @author jason
+ */
+@Data
+public class AlreadyRunApproveNodeRespBO {
+
+    private List<ApproveNodeInfo> approveNodeList;
+
+    private Set<String> runNodeIds;
+
+}