From 53c14197dc911c557fb4505e508f161887a29297 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Wed, 28 Dec 2022 13:42:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=BC=80=E5=A7=8B,=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FlowTaskServiceImpl.java     | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

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<HistoricActivityInstance> list = historyService
                     .createHistoricActivityInstanceQuery()
                     .processInstanceId(procInsId)
-                    .orderByHistoricActivityInstanceStartTime()
+                    .orderByHistoricActivityInstanceEndTime()
                     .desc().list();
             List<FlowTaskDto> 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<Task> taskList = taskService.createTaskQuery().processInstanceId(procInsId).list();
-//            if (CollectionUtils.isNotEmpty(taskList)) {
-//                map.put("finished", true);
-//            } else {
-//                map.put("finished", false);
-//            }
         }
         // 第一次申请获取初始化表单
         if (StringUtils.isNotBlank(deployId)) {