DeXun/double-rack
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 流程记录展示开始,结束节点

Browse Source
This commit is contained in:
tony
2022-12-28 13:42:15 +08:00
parent d6a22e8489
commit 53c14197dc
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java
View File

@@ -794,11 +794,27 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
List<HistoricActivityInstance> list = historyService List<HistoricActivityInstance> list = historyService
.createHistoricActivityInstanceQuery() .createHistoricActivityInstanceQuery()
.processInstanceId(procInsId) .processInstanceId(procInsId)
.orderByHistoricActivityInstanceStartTime() .orderByHistoricActivityInstanceEndTime()
.desc().list(); .desc().list();
List<FlowTaskDto> hisFlowList = new ArrayList<>(); List<FlowTaskDto> hisFlowList = new ArrayList<>();
for (HistoricActivityInstance histIns : list) { 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(); FlowTaskDto flowTask = new FlowTaskDto();
flowTask.setTaskId(histIns.getTaskId()); flowTask.setTaskId(histIns.getTaskId());
flowTask.setTaskName(histIns.getActivityName()); flowTask.setTaskName(histIns.getActivityName());
@@ -842,13 +858,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
} }
} }
map.put("flowList", hisFlowList); 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)) { if (StringUtils.isNotBlank(deployId)) {