From 3855664a7ca3c60dd3f3dc32e738f66cdec993d8 Mon Sep 17 00:00:00 2001
From: sunjianxi <839419401@qq.com>
Date: Tue, 30 Dec 2025 13:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=9B=B8=E5=85=B3-sjx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduling/service/impl/WorkOrderServiceImpl.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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<WorkOrderMapper, WorkO
             WorkOrderDto workOrderDto = new WorkOrderDto();
             String woCode = entry.getKey();
             List<WorkOrderDto> woList = entry.getValue();
-
+            workOrderDto.setWoCode(woCode);
+            workOrderDto.setWorkOrderList(entry.getValue());
+            resultList.add(workOrderDto);
             //按processName二次分组
-            Map<String, List<WorkOrderDto>> processGroup = woList.stream()
+           /* Map<String, List<WorkOrderDto>> processGroup = woList.stream()
                     .collect(Collectors.groupingBy(WorkOrderDto::getProcessName));
 
             //整合每个processName的时间
@@ -238,7 +240,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             mergedProcessList.sort(Comparator.comparing(WorkOrderDto::getPlanStartTime));
             workOrderDto.setWoCode(woCode);
             workOrderDto.setWorkOrderList(mergedProcessList);
-            resultList.add(workOrderDto);
+            resultList.add(workOrderDto);*/
             //resultList.put(woCode, mergedProcessList);
         }