|
@@ -3180,12 +3180,15 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
|
|
|
.map(CirculatedTaskPageVo::getProcessId) // 使用map方法将对象映射为属性
|
|
.map(CirculatedTaskPageVo::getProcessId) // 使用map方法将对象映射为属性
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
List<Task> list = taskService.createTaskQuery().taskIdIn(taskIds).list();
|
|
List<Task> list = taskService.createTaskQuery().taskIdIn(taskIds).list();
|
|
|
- QueryWrapper<WorkflowExtra> workflowExtraQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
- workflowExtraQueryWrapper
|
|
|
|
|
- .select("process_id as process_id, MAX(current_progress) as current_progress")
|
|
|
|
|
- .in("process_id", processIds)
|
|
|
|
|
- .groupBy("process_id");
|
|
|
|
|
- List<WorkflowExtra> workflowExtraList = xjrWorkflowExtraMapper.selectList(workflowExtraQueryWrapper);
|
|
|
|
|
|
|
+ List<WorkflowExtra> workflowExtraList = new ArrayList<>();
|
|
|
|
|
+ if(processIds.size() > 0){
|
|
|
|
|
+ QueryWrapper<WorkflowExtra> workflowExtraQueryWrapper = new QueryWrapper<>();
|
|
|
|
|
+ workflowExtraQueryWrapper
|
|
|
|
|
+ .select("process_id as process_id, MAX(current_progress) as current_progress")
|
|
|
|
|
+ .in("process_id", processIds)
|
|
|
|
|
+ .groupBy("process_id");
|
|
|
|
|
+ workflowExtraList = xjrWorkflowExtraMapper.selectList(workflowExtraQueryWrapper);
|
|
|
|
|
+ }
|
|
|
for (CirculatedTaskPageVo record : page.getRecords()) {
|
|
for (CirculatedTaskPageVo record : page.getRecords()) {
|
|
|
Optional<Task> thisTask = list.stream().filter(x -> x.getId().equals(record.getTaskId())).findFirst();
|
|
Optional<Task> thisTask = list.stream().filter(x -> x.getId().equals(record.getTaskId())).findFirst();
|
|
|
Optional<WorkflowExtra> thisWorkflowExtra = workflowExtraList.stream().filter(x -> x.getProcessId().equals(record.getProcessId())).findFirst();
|
|
Optional<WorkflowExtra> thisWorkflowExtra = workflowExtraList.stream().filter(x -> x.getProcessId().equals(record.getProcessId())).findFirst();
|