【代码评审】Bpm：数据报表

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/simple/BpmSimpleModelNodeVO.java

@@ -362,6 +362,7 @@ public class BpmSimpleModelNodeVO {
             @Valid
             private List<HttpRequestParam> body;
 
+            // TODO @json：可能未来看情况，搞个 HttpResponseParam；得看看有没别的业务需要，抽象统一
             /**
              * 请求返回处理设置，用于修改流程表单值
              *

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
-import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -40,7 +39,7 @@ public class BpmProcessInstancePageReqVO extends PageParam {
     @Schema(description = "发起用户编号", example = "1024")
     private Long startUserId; // 注意，只有在【流程实例】菜单，才使用该参数
 
-    @Schema(description = "动态表单字段查询JSON Str", example = "{}")
-    private String formFieldsParams;
+    @Schema(description = "动态表单字段查询 JSON Str", example = "{}")
+    private String formFieldsParams; // SpringMVC 在 get 请求下，无法方便的定义 Map 类型的参数，所以通过 String 接收后，逻辑里面转换
 
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java

@@ -7,7 +7,6 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
@@ -134,69 +133,18 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
 
     @Override
     public HistoricProcessInstance getHistoricProcessInstance(String id) {
-        return historyService.createHistoricProcessInstanceQuery().processInstanceId(id).includeProcessVariables().singleResult();
+        return historyService.createHistoricProcessInstanceQuery().processInstanceId(id).includeProcessVariables()
+                .singleResult();
     }
 
     @Override
     public List<HistoricProcessInstance> getHistoricProcessInstances(Set<String> ids) {
-        return historyService.createHistoricProcessInstanceQuery().processInstanceIds(ids).includeProcessVariables().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.getProcessDefinitionKey())) {
-            processInstanceQuery.processDefinitionKey(pageReqVO.getProcessDefinitionKey());
-        }
-        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]));
-        }
-        if (ArrayUtil.isNotEmpty(pageReqVO.getEndTime())) {
-            processInstanceQuery.finishedAfter(DateUtils.of(pageReqVO.getEndTime()[0]));
-            processInstanceQuery.finishedBefore(DateUtils.of(pageReqVO.getEndTime()[1]));
-        }
-        // 表单字段查询
-        // TODO 应支持多种类型的查询方式，目前只有字符串全等
-        if (StrUtil.isNotEmpty(pageReqVO.getFormFieldsParams())) {
-            JSONObject formFieldsParams = new JSONObject(pageReqVO.getFormFieldsParams());
-            for (Map.Entry<String, Object> field : formFieldsParams.entrySet()) {
-                if (StrUtil.isNotEmpty(field.getValue().toString())) {
-                    processInstanceQuery.variableValueEquals(field.getKey(), field.getValue());
-                }
-            }
-        }
-        // 查询数量
-        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);
+        return historyService.createHistoricProcessInstanceQuery().processInstanceIds(ids).includeProcessVariables()
+                .list();
     }
 
     private Map<String, String> getFormFieldsPermission(BpmnModel bpmnModel,
-                                                        String activityId, String taskId) {
+            String activityId, String taskId) {
         // 1. 获取流程活动编号。流程活动 Id 为空事，从流程任务中获取流程活动 Id
         if (StrUtil.isEmpty(activityId) && StrUtil.isNotEmpty(taskId)) {
             activityId = Optional.ofNullable(taskService.getHistoricTask(taskId))
@@ -229,8 +177,10 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         }
         // 1.3 读取其它相关数据
         ProcessDefinition processDefinition = processDefinitionService.getProcessDefinition(
-                historicProcessInstance != null ? historicProcessInstance.getProcessDefinitionId() : reqVO.getProcessDefinitionId());
-        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(processDefinition.getId());
+                historicProcessInstance != null ? historicProcessInstance.getProcessDefinitionId()
+                        : reqVO.getProcessDefinitionId());
+        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService
+                .getProcessDefinitionInfo(processDefinition.getId());
         BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processDefinition.getId());
 
         // 2.1 已结束 + 进行中的活动节点
@@ -239,24 +189,29 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         List<HistoricActivityInstance> activities = null; // 流程实例列表
         if (reqVO.getProcessInstanceId() != null) {
             activities = taskService.getActivityListByProcessInstanceId(reqVO.getProcessInstanceId());
-            List<HistoricTaskInstance> tasks = taskService.getTaskListByProcessInstanceId(reqVO.getProcessInstanceId(), true);
+            List<HistoricTaskInstance> tasks = taskService.getTaskListByProcessInstanceId(reqVO.getProcessInstanceId(),
+                    true);
             endActivityNodes = getEndActivityNodeList(startUserId, bpmnModel, processDefinitionInfo,
                     historicProcessInstance, processInstanceStatus, activities, tasks);
-            runActivityNodes = getRunApproveNodeList(startUserId, bpmnModel, processDefinition, processVariables, activities, tasks);
+            runActivityNodes = getRunApproveNodeList(startUserId, bpmnModel, processDefinition, processVariables,
+                    activities, tasks);
         }
 
         // 2.2 流程已经结束，直接 return，无需预测
         if (BpmProcessInstanceStatusEnum.isProcessEndStatus(processInstanceStatus)) {
-            return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo, historicProcessInstance,
+            return buildApprovalDetail(reqVO, bpmnModel, processDefinition, processDefinitionInfo,
+                    historicProcessInstance,
                     processInstanceStatus, endActivityNodes, runActivityNodes, null, null);
         }
 
         // 3.1 计算当前登录用户的待办任务
-        // TODO @jason：有一个极端情况，如果一个用户有 2 个 task A 和 B，A 已经通过，B 需要审核。这个时，通过 A 进来，todo 拿到 B，会不会表单权限不一致哈。
+        // TODO @jason：有一个极端情况，如果一个用户有 2 个 task A 和 B，A 已经通过，B 需要审核。这个时，通过 A 进来，todo 拿到
+        // B，会不会表单权限不一致哈。
         BpmTaskRespVO todoTask = taskService.getFirstTodoTask(loginUserId, reqVO.getProcessInstanceId());
 
         // 3.2 预测未运行节点的审批信息
-        List<ActivityNode> simulateActivityNodes = getSimulateApproveNodeList(startUserId, bpmnModel, processDefinitionInfo,
+        List<ActivityNode> simulateActivityNodes = getSimulateApproveNodeList(startUserId, bpmnModel,
+                processDefinitionInfo,
                 processVariables, activities);
 
         // 4. 拼接最终数据
@@ -264,34 +219,93 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
                 processInstanceStatus, endActivityNodes, runActivityNodes, simulateActivityNodes, todoTask);
     }
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public PageResult<HistoricProcessInstance> getProcessInstancePage(Long userId,
+                                                                      BpmProcessInstancePageReqVO pageReqVO) {
+        // 1. 构建查询条件
+        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.getProcessDefinitionKey())) {
+            processInstanceQuery.processDefinitionKey(pageReqVO.getProcessDefinitionKey());
+        }
+        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]));
+        }
+        if (ArrayUtil.isNotEmpty(pageReqVO.getEndTime())) {
+            processInstanceQuery.finishedAfter(DateUtils.of(pageReqVO.getEndTime()[0]));
+            processInstanceQuery.finishedBefore(DateUtils.of(pageReqVO.getEndTime()[1]));
+        }
+        // 表单字段查询
+        Map<String, Object> formFieldsParams = JsonUtils.parseObject(pageReqVO.getFormFieldsParams(), Map.class);
+        if (CollUtil.isNotEmpty(formFieldsParams)) {
+            formFieldsParams.forEach((key, value) -> {
+                if (StrUtil.isEmpty(String.valueOf(value))) {
+                    return;
+                }
+                // TODO @lesan：应支持多种类型的查询方式，目前只有字符串全等
+                processInstanceQuery.variableValueEquals(key, value);
+            });
+        }
+
+        // 2.1 查询数量
+        long processInstanceCount = processInstanceQuery.count();
+        if (processInstanceCount == 0) {
+            return PageResult.empty(processInstanceCount);
+        }
+        // 2.2 查询列表
+        List<HistoricProcessInstance> processInstanceList = processInstanceQuery.listPage(PageUtils.getStart(pageReqVO),
+                pageReqVO.getPageSize());
+        return new PageResult<>(processInstanceList, processInstanceCount);
+    }
+
     /**
      * 拼接审批详情的最终数据
      * <p>
      * 主要是，拼接审批人的用户信息、部门信息
      */
     private BpmApprovalDetailRespVO buildApprovalDetail(BpmApprovalDetailReqVO reqVO,
-                                                        BpmnModel bpmnModel,
-                                                        ProcessDefinition processDefinition,
-                                                        BpmProcessDefinitionInfoDO processDefinitionInfo,
-                                                        HistoricProcessInstance processInstance,
-                                                        Integer processInstanceStatus,
-                                                        List<ActivityNode> endApprovalNodeInfos,
-                                                        List<ActivityNode> runningApprovalNodeInfos,
-                                                        List<ActivityNode> simulateApprovalNodeInfos,
-                                                        BpmTaskRespVO todoTask) {
+            BpmnModel bpmnModel,
+            ProcessDefinition processDefinition,
+            BpmProcessDefinitionInfoDO processDefinitionInfo,
+            HistoricProcessInstance processInstance,
+            Integer processInstanceStatus,
+            List<ActivityNode> endApprovalNodeInfos,
+            List<ActivityNode> runningApprovalNodeInfos,
+            List<ActivityNode> simulateApprovalNodeInfos,
+            BpmTaskRespVO todoTask) {
         // 1. 获取所有需要读取用户信息的 userIds
-        List<ActivityNode> approveNodes = newArrayList(asList(endApprovalNodeInfos, runningApprovalNodeInfos, simulateApprovalNodeInfos));
+        List<ActivityNode> approveNodes = newArrayList(
+                asList(endApprovalNodeInfos, runningApprovalNodeInfos, simulateApprovalNodeInfos));
         Set<Long> userIds = BpmProcessInstanceConvert.INSTANCE.parseUserIds(processInstance, approveNodes, todoTask);
         Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
         Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
 
-
         // 2. 表单权限
         String taskId = reqVO.getTaskId() == null && todoTask != null ? todoTask.getId() : reqVO.getTaskId();
         Map<String, String> formFieldsPermission = getFormFieldsPermission(bpmnModel, reqVO.getActivityId(), taskId);
 
         // 3. 拼接数据
-        return BpmProcessInstanceConvert.INSTANCE.buildApprovalDetail(bpmnModel, processDefinition, processDefinitionInfo, processInstance,
+        return BpmProcessInstanceConvert.INSTANCE.buildApprovalDetail(bpmnModel, processDefinition,
+                processDefinitionInfo, processInstance,
                 processInstanceStatus, approveNodes, todoTask, formFieldsPermission, userMap, deptMap);
     }
 
@@ -299,17 +313,19 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
      * 获得【已结束】的活动节点们
      */
     private List<ActivityNode> getEndActivityNodeList(Long startUserId, BpmnModel bpmnModel,
-                                                      BpmProcessDefinitionInfoDO processDefinitionInfo,
-                                                      HistoricProcessInstance historicProcessInstance, Integer processInstanceStatus,
-                                                      List<HistoricActivityInstance> activities, List<HistoricTaskInstance> tasks) {
+            BpmProcessDefinitionInfoDO processDefinitionInfo,
+            HistoricProcessInstance historicProcessInstance, Integer processInstanceStatus,
+            List<HistoricActivityInstance> activities, List<HistoricTaskInstance> tasks) {
         // 遍历 tasks 列表，只处理已结束的 UserTask
-        // 为什么不通过 activities 呢？因为，加签场景下，它只存在于 tasks，没有 activities，导致如果遍历 activities 的话，它无法成为一个节点
+        // 为什么不通过 activities 呢？因为，加签场景下，它只存在于 tasks，没有 activities，导致如果遍历 activities
+        // 的话，它无法成为一个节点
         List<HistoricTaskInstance> endTasks = filterList(tasks, task -> task.getEndTime() != null);
         List<ActivityNode> approvalNodes = convertList(endTasks, task -> {
             FlowElement flowNode = BpmnModelUtils.getFlowElementById(bpmnModel, task.getTaskDefinitionKey());
             ActivityNode activityNode = new ActivityNode().setId(task.getTaskDefinitionKey()).setName(task.getName())
-                    .setNodeType(START_USER_NODE_ID.equals(task.getTaskDefinitionKey()) ?
-                            BpmSimpleModelNodeTypeEnum.START_USER_NODE.getType() : BpmSimpleModelNodeTypeEnum.APPROVE_NODE.getType())
+                    .setNodeType(START_USER_NODE_ID.equals(task.getTaskDefinitionKey())
+                            ? BpmSimpleModelNodeTypeEnum.START_USER_NODE.getType()
+                            : BpmSimpleModelNodeTypeEnum.APPROVE_NODE.getType())
                     .setStatus(FlowableUtils.getTaskStatus(task))
                     .setCandidateStrategy(BpmnModelUtils.parseCandidateStrategy(flowNode))
                     .setStartTime(DateUtils.of(task.getCreateTime())).setEndTime(DateUtils.of(task.getEndTime()))
@@ -334,7 +350,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
                         .setName(BpmSimpleModelNodeTypeEnum.START_USER_NODE.getName())
                         .setNodeType(BpmSimpleModelNodeTypeEnum.START_USER_NODE.getType())
                         .setStatus(startTask.getStatus()).setTasks(ListUtil.of(startTask))
-                        .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime()));
+                        .setStartTime(DateUtils.of(activity.getStartTime()))
+                        .setEndTime(DateUtils.of(activity.getEndTime()));
                 approvalNodes.add(0, startNode);
                 return;
             }
@@ -347,7 +364,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
                 ActivityNode endNode = new ActivityNode().setId(activity.getId())
                         .setName(BpmSimpleModelNodeTypeEnum.END_NODE.getName())
                         .setNodeType(BpmSimpleModelNodeTypeEnum.END_NODE.getType()).setStatus(processInstanceStatus)
-                        .setStartTime(DateUtils.of(activity.getStartTime())).setEndTime(DateUtils.of(activity.getEndTime()));
+                        .setStartTime(DateUtils.of(activity.getStartTime()))
+                        .setEndTime(DateUtils.of(activity.getEndTime()));
                 String reason = FlowableUtils.getProcessInstanceReason(historicProcessInstance);
                 if (StrUtil.isNotEmpty(reason)) {
                     endNode.setTasks(singletonList(new ActivityNodeTask().setId(endNode.getId())
@@ -363,15 +381,16 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
      * 获得【进行中】的活动节点们
      */
     private List<ActivityNode> getRunApproveNodeList(Long startUserId,
-                                                     BpmnModel bpmnModel,
-                                                     ProcessDefinition processDefinition,
-                                                     Map<String, Object> processVariables,
-                                                     List<HistoricActivityInstance> activities,
-                                                     List<HistoricTaskInstance> tasks) {
+            BpmnModel bpmnModel,
+            ProcessDefinition processDefinition,
+            Map<String, Object> processVariables,
+            List<HistoricActivityInstance> activities,
+            List<HistoricTaskInstance> tasks) {
         // 构建运行中的任务，基于 activityId 分组
         List<HistoricActivityInstance> runActivities = filterList(activities, activity -> activity.getEndTime() == null
                 && (StrUtil.equalsAny(activity.getActivityType(), ELEMENT_TASK_USER)));
-        Map<String, List<HistoricActivityInstance>> runningTaskMap = convertMultiMap(runActivities, HistoricActivityInstance::getActivityId);
+        Map<String, List<HistoricActivityInstance>> runningTaskMap = convertMultiMap(runActivities,
+                HistoricActivityInstance::getActivityId);
 
         // 按照 activityId 分组，构建 ApprovalNodeInfo 节点
         Map<String, HistoricTaskInstance> taskMap = convertMap(tasks, HistoricTaskInstance::getId);
@@ -381,8 +400,10 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
             // 构建活动节点
             FlowElement flowNode = BpmnModelUtils.getFlowElementById(bpmnModel, activityId);
             HistoricActivityInstance firstActivity = CollUtil.getFirst(taskActivities); // 取第一个任务，会签/或签的任务，开始时间相同
-            ActivityNode activityNode = new ActivityNode().setId(firstActivity.getActivityId()).setName(firstActivity.getActivityName())
-                    .setNodeType(BpmSimpleModelNodeTypeEnum.APPROVE_NODE.getType()).setStatus(BpmTaskStatusEnum.RUNNING.getStatus())
+            ActivityNode activityNode = new ActivityNode().setId(firstActivity.getActivityId())
+                    .setName(firstActivity.getActivityName())
+                    .setNodeType(BpmSimpleModelNodeTypeEnum.APPROVE_NODE.getType())
+                    .setStatus(BpmTaskStatusEnum.RUNNING.getStatus())
                     .setCandidateStrategy(BpmnModelUtils.parseCandidateStrategy(flowNode))
                     .setStartTime(DateUtils.of(CollUtil.getFirst(taskActivities).getStartTime()))
                     .setTasks(new ArrayList<>());
@@ -395,7 +416,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
                         taskService.getAllChildrenTaskListByParentTaskId(activity.getTaskId(), tasks),
                         childTask -> childTask.getEndTime() == null);
                 if (CollUtil.isNotEmpty(childrenTasks)) {
-                    activityNode.getTasks().addAll(convertList(childrenTasks, BpmProcessInstanceConvert.INSTANCE::buildApprovalTaskInfo));
+                    activityNode.getTasks().addAll(
+                            convertList(childrenTasks, BpmProcessInstanceConvert.INSTANCE::buildApprovalTaskInfo));
                 }
             }
             // 处理每个任务的 candidateUsers 属性：如果是依次审批，需要预测它的后续审批人。因为 Task 是审批完一个，创建一个新的 Task
@@ -405,8 +427,9 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
                 // 截取当前审批人位置后面的候选人，不包含当前审批人
                 ActivityNodeTask approvalTaskInfo = CollUtil.getFirst(activityNode.getTasks());
                 Assert.notNull(approvalTaskInfo, "任务不能为空");
-                int index = CollUtil.indexOf(candidateUserIds, userId -> ObjectUtils.equalsAny(userId, approvalTaskInfo.getOwner(),
-                        approvalTaskInfo.getAssignee())); // 委派或者向前加签情况，需要先比较 owner
+                int index = CollUtil.indexOf(candidateUserIds,
+                        userId -> ObjectUtils.equalsAny(userId, approvalTaskInfo.getOwner(),
+                                approvalTaskInfo.getAssignee())); // 委派或者向前加签情况，需要先比较 owner
                 activityNode.setCandidateUserIds(CollUtil.sub(candidateUserIds, index + 1, candidateUserIds.size()));
             }
             return activityNode;
@@ -417,10 +440,11 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
      * 获得【预测（未来）】的活动节点们
      */
     private List<ActivityNode> getSimulateApproveNodeList(Long startUserId, BpmnModel bpmnModel,
-                                                          BpmProcessDefinitionInfoDO processDefinitionInfo,
-                                                          Map<String, Object> processVariables,
-                                                          List<HistoricActivityInstance> activities) {
-        // TODO @芋艿：【可优化】在驳回场景下，未来的预测准确性不高。原因是，驳回后，HistoricActivityInstance 包括了历史的操作，不是只有 startEvent 到当前节点的记录
+            BpmProcessDefinitionInfoDO processDefinitionInfo,
+            Map<String, Object> processVariables,
+            List<HistoricActivityInstance> activities) {
+        // TODO @芋艿：【可优化】在驳回场景下，未来的预测准确性不高。原因是，驳回后，HistoricActivityInstance
+        // 包括了历史的操作，不是只有 startEvent 到当前节点的记录
         Set<String> runActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId);
         // 情况一：BPMN 设计器
         if (Objects.equals(BpmModelTypeEnum.BPMN.getType(), processDefinitionInfo.getModelType())) {
@@ -430,7 +454,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         }
         // 情况二：SIMPLE 设计器
         if (Objects.equals(BpmModelTypeEnum.SIMPLE.getType(), processDefinitionInfo.getModelType())) {
-            BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class);
+            BpmSimpleModelNodeVO simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(),
+                    BpmSimpleModelNodeVO.class);
             List<BpmSimpleModelNodeVO> simpleNodes = SimpleModelUtils.simulateProcess(simpleModel, processVariables);
             return convertList(simpleNodes, simpleNode -> buildNotRunApproveNodeForSimple(startUserId, bpmnModel,
                     processDefinitionInfo, processVariables, simpleNode, runActivityIds));
@@ -439,9 +464,10 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
     }
 
     private ActivityNode buildNotRunApproveNodeForSimple(Long startUserId, BpmnModel bpmnModel,
-                                                         BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables,
-                                                         BpmSimpleModelNodeVO node, Set<String> runActivityIds) {
-        // TODO @芋艿：【可优化】在驳回场景下，未来的预测准确性不高。原因是，驳回后，HistoricActivityInstance 包括了历史的操作，不是只有 startEvent 到当前节点的记录
+            BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables,
+            BpmSimpleModelNodeVO node, Set<String> runActivityIds) {
+        // TODO @芋艿：【可优化】在驳回场景下，未来的预测准确性不高。原因是，驳回后，HistoricActivityInstance
+        // 包括了历史的操作，不是只有 startEvent 到当前节点的记录
         if (runActivityIds.contains(node.getId())) {
             return null;
         }
@@ -474,12 +500,13 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
     }
 
     private ActivityNode buildNotRunApproveNodeForBpmn(Long startUserId, BpmnModel bpmnModel,
-                                                       BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables,
-                                                       FlowElement node, Set<String> runActivityIds) {
+            BpmProcessDefinitionInfoDO processDefinitionInfo, Map<String, Object> processVariables,
+            FlowElement node, Set<String> runActivityIds) {
         if (runActivityIds.contains(node.getId())) {
             return null;
         }
-        ActivityNode activityNode = new ActivityNode().setId(node.getId()).setStatus(BpmTaskStatusEnum.NOT_START.getStatus());
+        ActivityNode activityNode = new ActivityNode().setId(node.getId())
+                .setStatus(BpmTaskStatusEnum.NOT_START.getStatus());
 
         // 1. 开始节点
         if (node instanceof StartEvent) {
@@ -505,7 +532,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
     }
 
     private List<Long> getTaskCandidateUserList(BpmnModel bpmnModel, String activityId,
-                                                Long startUserId, String processDefinitionId, Map<String, Object> processVariables) {
+            Long startUserId, String processDefinitionId, Map<String, Object> processVariables) {
         Set<Long> userIds = taskCandidateInvoker.calculateUsersByActivity(bpmnModel, activityId,
                 startUserId, processDefinitionId, processVariables);
         return new ArrayList<>(userIds);
@@ -519,14 +546,16 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
             return null;
         }
         // 1.2 获得流程定义
-        BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId());
+        BpmnModel bpmnModel = processDefinitionService
+                .getProcessDefinitionBpmnModel(processInstance.getProcessDefinitionId());
         if (bpmnModel == null) {
             return null;
         }
         BpmSimpleModelNodeVO simpleModel = null;
         BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(
                 processInstance.getProcessDefinitionId());
-        if (processDefinitionInfo != null && BpmModelTypeEnum.SIMPLE.getType().equals(processDefinitionInfo.getModelType())) {
+        if (processDefinitionInfo != null
+                && BpmModelTypeEnum.SIMPLE.getType().equals(processDefinitionInfo.getModelType())) {
             simpleModel = JsonUtils.parseObject(processDefinitionInfo.getSimpleModel(), BpmSimpleModelNodeVO.class);
         }
         // 1.3 获得流程实例对应的活动实例列表 + 任务列表
@@ -538,10 +567,12 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
                 activityInstance -> activityInstance.getEndTime() == null);
         Set<String> finishedTaskActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId,
                 activityInstance -> activityInstance.getEndTime() != null
-                        && ObjectUtil.notEqual(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW));
+                        && ObjectUtil.notEqual(activityInstance.getActivityType(),
+                                BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW));
         Set<String> finishedSequenceFlowActivityIds = convertSet(activities, HistoricActivityInstance::getActivityId,
                 activityInstance -> activityInstance.getEndTime() != null
-                        && ObjectUtil.equals(activityInstance.getActivityType(), BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW));
+                        && ObjectUtil.equals(activityInstance.getActivityType(),
+                                BpmnXMLConstants.ELEMENT_SEQUENCE_FLOW));
         // 特殊：会签情况下，会有部分已完成（审批）、部分未完成（待审批），此时需要 finishedTaskActivityIds 移除掉
         finishedTaskActivityIds.removeAll(unfinishedTaskActivityIds);
         // 特殊：如果流程实例被拒绝，则需要计算是哪个活动节点。
@@ -559,8 +590,10 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         Set<Long> userIds = BpmProcessInstanceConvert.INSTANCE.parseUserIds02(processInstance, tasks);
         Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
         Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(userMap.values(), AdminUserRespDTO::getDeptId));
-        return BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceBpmnModelView(processInstance, tasks, bpmnModel, simpleModel,
-                unfinishedTaskActivityIds, finishedTaskActivityIds, finishedSequenceFlowActivityIds, rejectTaskActivityIds,
+        return BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceBpmnModelView(processInstance, tasks, bpmnModel,
+                simpleModel,
+                unfinishedTaskActivityIds, finishedTaskActivityIds, finishedSequenceFlowActivityIds,
+                rejectTaskActivityIds,
                 userMap, deptMap);
     }
 
@@ -570,7 +603,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
     @Transactional(rollbackFor = Exception.class)
     public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqVO createReqVO) {
         // 获得流程定义
-        ProcessDefinition definition = processDefinitionService.getProcessDefinition(createReqVO.getProcessDefinitionId());
+        ProcessDefinition definition = processDefinitionService
+                .getProcessDefinition(createReqVO.getProcessDefinitionId());
         // 发起流程
         return createProcessInstance0(userId, definition, createReqVO.getVariables(), null,
                 createReqVO.getStartUserSelectAssignees());
@@ -580,16 +614,18 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
     public String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO createReqDTO) {
         return FlowableUtils.executeAuthenticatedUserId(userId, () -> {
             // 获得流程定义
-            ProcessDefinition definition = processDefinitionService.getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey());
+            ProcessDefinition definition = processDefinitionService
+                    .getActiveProcessDefinition(createReqDTO.getProcessDefinitionKey());
             // 发起流程
-            return createProcessInstance0(userId, definition, createReqDTO.getVariables(), createReqDTO.getBusinessKey(),
+            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) {
+            Map<String, Object> variables, String businessKey,
+            Map<String, List<Long>> startUserSelectAssignees) {
         // 1.1 校验流程定义
         if (definition == null) {
             throw exception(PROCESS_DEFINITION_NOT_EXISTS);
@@ -597,7 +633,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         if (definition.isSuspended()) {
             throw exception(PROCESS_DEFINITION_IS_SUSPENDED);
         }
-        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(definition.getId());
+        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService
+                .getProcessDefinitionInfo(definition.getId());
         if (processDefinitionInfo == null) {
             throw exception(PROCESS_DEFINITION_NOT_EXISTS);
         }
@@ -616,9 +653,12 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_ID, userId); // 设置流程变量，发起人 ID
         variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS, // 流程实例状态：审批中
                 BpmProcessInstanceStatusEnum.RUNNING.getStatus());
-        variables.put(BpmnVariableConstants.PROCESS_INSTANCE_SKIP_EXPRESSION_ENABLED, true); // 跳过表达式需要添加此变量为 true，不影响没配置 skipExpression 的节点
+        variables.put(BpmnVariableConstants.PROCESS_INSTANCE_SKIP_EXPRESSION_ENABLED, true); // 跳过表达式需要添加此变量为
+                                                                                             // true，不影响没配置
+                                                                                             // skipExpression 的节点
         if (CollUtil.isNotEmpty(startUserSelectAssignees)) {
-            variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES, startUserSelectAssignees);
+            variables.put(BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_START_USER_SELECT_ASSIGNEES,
+                    startUserSelectAssignees);
         }
 
         // 3. 创建流程
@@ -648,7 +688,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         return instance.getId();
     }
 
-    private void validateStartUserSelectAssignees(ProcessDefinition definition, Map<String, List<Long>> startUserSelectAssignees) {
+    private void validateStartUserSelectAssignees(ProcessDefinition definition,
+            Map<String, List<Long>> startUserSelectAssignees) {
         // 1. 获得发起人自选审批人的 UserTask/ServiceTask 列表
         BpmnModel bpmnModel = processDefinitionService.getProcessDefinitionBpmnModel(definition.getId());
         List<Task> tasks = BpmTaskCandidateStartUserSelectStrategy.getStartUserSelectTaskList(bpmnModel);
@@ -683,7 +724,8 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
             throw exception(PROCESS_INSTANCE_CANCEL_FAIL_NOT_SELF);
         }
         // 1.3 校验允许撤销审批中的申请
-        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService.getProcessDefinitionInfo(instance.getProcessDefinitionId());
+        BpmProcessDefinitionInfoDO processDefinitionInfo = processDefinitionService
+                .getProcessDefinitionInfo(instance.getProcessDefinitionId());
         Assert.notNull(processDefinitionInfo, "流程定义({})不存在", processDefinitionInfo);
         if (processDefinitionInfo.getAllowCancelRunningProcess() != null // 防止未配置 AllowCancelRunningProcess , 默认为可取消
                 && Boolean.FALSE.equals(processDefinitionInfo.getAllowCancelRunningProcess())) {
@@ -721,9 +763,11 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
 
     @Override
     public void updateProcessInstanceReject(ProcessInstance processInstance, String reason) {
-        runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,
+        runtimeService.setVariable(processInstance.getProcessInstanceId(),
+                BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,
                 BpmProcessInstanceStatusEnum.REJECT.getStatus());
-        runtimeService.setVariable(processInstance.getProcessInstanceId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON,
+        runtimeService.setVariable(processInstance.getProcessInstanceId(),
+                BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_REASON,
                 BpmReasonEnum.REJECT_TASK.format(reason));
     }
 
@@ -734,18 +778,22 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
         // 注意：需要基于 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);
+            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);
+                runtimeService.setVariable(instance.getId(), BpmnVariableConstants.PROCESS_INSTANCE_VARIABLE_STATUS,
+                        status);
             }
 
             // 2. 发送对应的消息通知
             if (Objects.equals(status, BpmProcessInstanceStatusEnum.APPROVE.getStatus())) {
-                messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance));
+                messageService.sendMessageWhenProcessInstanceApprove(
+                        BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceApproveMessage(instance));
             } else if (Objects.equals(status, BpmProcessInstanceStatusEnum.REJECT.getStatus())) {
                 messageService.sendMessageWhenProcessInstanceReject(
                         BpmProcessInstanceConvert.INSTANCE.buildProcessInstanceRejectMessage(instance, reason));