|
|
@@ -3363,8 +3363,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
|
|
|
|
|
|
for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
|
|
|
-
|
|
|
- //找到当前流程的 任务开始时间 最大值 为当前审批节点
|
|
|
+ //找到当前流程的 任务开始时间 最大值 为当前审批节点
|
|
|
workflowExtras.stream()
|
|
|
.filter(e -> e.getProcessId().equals(historicProcessInstance.getId()))
|
|
|
.max(Comparator.comparing(WorkflowExtra::getStartTime))
|
|
|
@@ -3375,10 +3374,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
vo.setSchemaName(e.getSchemaName());
|
|
|
vo.setOriginator(e.getStartUserName());
|
|
|
vo.setSchemaId(e.getSchemaId());
|
|
|
-
|
|
|
vo.setTaskName(e.getTaskName());
|
|
|
vo.setCurrentTaskName(e.getTaskName());
|
|
|
vo.setTaskId(e.getTaskId());
|
|
|
+ vo.setActivityId(historicProcessInstance.getStartActivityId());
|
|
|
vo.setCreateTime(e.getStartTime());
|
|
|
vo.setProcessId(e.getProcessId());
|
|
|
vo.setProcessName(e.getProcessName());
|