diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index 810f1923..599d1e5e 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -191,9 +191,11 @@ public class WorkOrderServiceImpl extends BaseServiceImpl woList = entry.getValue(); - + workOrderDto.setWoCode(woCode); + workOrderDto.setWorkOrderList(entry.getValue()); + resultList.add(workOrderDto); //按processName二次分组 - Map> processGroup = woList.stream() + /* Map> processGroup = woList.stream() .collect(Collectors.groupingBy(WorkOrderDto::getProcessName)); //整合每个processName的时间 @@ -238,7 +240,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl