设备维修

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -112,7 +112,8 @@ public class PlanResultService {
 
     @Autowired
     private MaterialRequirementService materialRequirementService;
-
+    @Autowired
+    private EquipMaintainTaskService _equipMaintainTaskService;
     private  LocalDateTime baseTime = LocalDateTime.of(2025, 11, 1, 0, 0, 0);
 
     public List<ScheduleChromosome> execute() {
@@ -1696,17 +1697,41 @@ private  GlobalParam InitGlobalParam()
                 .eq(PlanResource::getIsdeleted, 0)
                 .list();
 
-
+        //维修记录
+        LambdaQueryWrapper<EquipMaintainTask> EquipMaintainTaskWrapper = new LambdaQueryWrapper<>();
+        EquipMaintainTaskWrapper.eq(EquipMaintainTask::getIsdeleted, 0);
+        EquipMaintainTaskWrapper.eq(EquipMaintainTask::getStatus, 0);
+        EquipMaintainTaskWrapper.ge(EquipMaintainTask::getPlanFinishTime, baseTime);
+        List<EquipMaintainTask> EquipMaintainTasks = _equipMaintainTaskService.list(EquipMaintainTaskWrapper);
 
         for (Long id : MachineIds) {
             Machine machine = new Machine();
-            PlanResource PlanResource = PlanResources.stream()
+            PlanResource planResource = PlanResources.stream()
                     .filter(t -> t.getId() == id.intValue())
                     .findFirst().orElse(null);
-            if (PlanResource != null){
-                machine.setCode(PlanResource.getReferenceCode());
-                machine.setName(PlanResource.getTitle());
-                machine.setDepartment(PlanResource.getDepartTitle());
+
+
+            List<MaintenanceWindow> maintenanceWindows=new ArrayList<>();
+            if (planResource != null){
+                machine.setCode(planResource.getReferenceCode());
+                machine.setName(planResource.getTitle());
+                machine.setDepartment(planResource.getDepartTitle());
+                List<EquipMaintainTask> EquipMaintainTasks1 = EquipMaintainTasks.stream()
+                        .filter(t -> t.getEquipId().equals(planResource.getReferenceId()) )
+                        .collect(Collectors.toList());
+                for (EquipMaintainTask equipMaintainTask : EquipMaintainTasks1) {
+                    MaintenanceWindow maintenanceWindow=new MaintenanceWindow();
+                    maintenanceWindow.setId(equipMaintainTask.getId().toString());
+                    maintenanceWindow.setStartTime(equipMaintainTask.getPlanStartTime());
+                    maintenanceWindow.setEndTime(equipMaintainTask.getPlanFinishTime());
+                    maintenanceWindow.setReason("");
+                    maintenanceWindows.add(maintenanceWindow);
+                }
+
+                machine.setMaintenanceWindows(maintenanceWindows);
+
+
+
             }
             machine.setId(id);
             machines.add(machine);
@@ -1855,4 +1880,5 @@ private  GlobalParam InitGlobalParam()
 
 
     }
+
 }
\ No newline at end of file