diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java index 48d11db2..6a1b3b01 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java @@ -794,11 +794,27 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask List list = historyService .createHistoricActivityInstanceQuery() .processInstanceId(procInsId) - .orderByHistoricActivityInstanceStartTime() + .orderByHistoricActivityInstanceEndTime() .desc().list(); List hisFlowList = new ArrayList<>(); for (HistoricActivityInstance histIns : list) { - if (StringUtils.isNotBlank(histIns.getTaskId())) { + // 展示开始节点 + if ("startEvent".equals(histIns.getActivityType())) { + FlowTaskDto flowTask = new FlowTaskDto(); + // 流程发起人信息 + HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() + .processInstanceId(histIns.getProcessInstanceId()) + .singleResult(); + SysUser startUser = sysUserService.selectUserById(Long.parseLong(historicProcessInstance.getStartUserId())); + flowTask.setTaskName(startUser.getNickName() + "(" + startUser.getDept().getDeptName() + ")发起申请"); + flowTask.setFinishTime(histIns.getEndTime()); + hisFlowList.add(flowTask); + } else if ("endEvent".equals(histIns.getActivityType())) { + FlowTaskDto flowTask = new FlowTaskDto(); + flowTask.setTaskName(StringUtils.isNotBlank(histIns.getActivityName()) ? histIns.getActivityName() : "结束"); + flowTask.setFinishTime(histIns.getEndTime()); + hisFlowList.add(flowTask); + } else if (StringUtils.isNotBlank(histIns.getTaskId())) { FlowTaskDto flowTask = new FlowTaskDto(); flowTask.setTaskId(histIns.getTaskId()); flowTask.setTaskName(histIns.getActivityName()); @@ -842,13 +858,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask } } map.put("flowList", hisFlowList); -// // 查询当前任务是否完成 -// List taskList = taskService.createTaskQuery().processInstanceId(procInsId).list(); -// if (CollectionUtils.isNotEmpty(taskList)) { -// map.put("finished", true); -// } else { -// map.put("finished", false); -// } } // 第一次申请获取初始化表单 if (StringUtils.isNotBlank(deployId)) {