|
|
@@ -3361,6 +3361,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
.like(WorkflowExtra::getProcessName, dto.getKeyword()))
|
|
|
.orderByDesc(WorkflowExtra::getStartTime));
|
|
|
|
|
|
+
|
|
|
for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
|
|
|
|
|
|
//找到当前流程的 任务开始时间 最大值 为当前审批节点
|
|
|
@@ -3381,7 +3382,11 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
vo.setCreateTime(e.getStartTime());
|
|
|
vo.setProcessId(e.getProcessId());
|
|
|
vo.setProcessName(e.getProcessName());
|
|
|
-
|
|
|
+ vo.setIsApproval(0);
|
|
|
+ Integer taskCount = workflowRecordMapper.getTaskCount(e.getTaskId());
|
|
|
+ if(taskCount > 1){
|
|
|
+ vo.setIsApproval(1);
|
|
|
+ }
|
|
|
//如果是已经完成的任务 默认是100进度
|
|
|
if (ObjectUtil.isNotNull(historicProcessInstance.getEndTime())) {
|
|
|
vo.setCurrentProgress(100);
|
|
|
@@ -3392,10 +3397,6 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
|
|
|
result.add(vo);
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
- MyProcessPageVo vo = new MyProcessPageVo();
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|