From be8a6f171bd41aa50fb7310b2ccbe753dac20b89 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 16:47:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index 5b678e1..8e13fa6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -158,8 +158,8 @@
String id = (String) record.get("id");
String equipmentId = (String) record.get("equipmentId");
String maintenanceStandardId = (String) record.get("maintenanceStandardId");
-// List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
-// record.put("maintenanceCycles", maintenanceCycles);
+ List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
+ record.put("maintenanceCycles", maintenanceCycles);
List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
@@ -239,9 +239,9 @@
for (Map<String, Object> record : records) {
String id = (String) record.get("id");
// String equipmentId = (String) record.get("equipmentId");
-// String maintenanceStandardId = (String) record.get("maintenanceStandardId");
-// List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
-// record.put("maintenanceCycles", maintenanceCycles);
+ String maintenanceStandardId = (String) record.get("maintenanceStandardId");
+ List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
+ record.put("maintenanceCycles", maintenanceCycles);
List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
//缁熻宸ユ椂瀹氶
--
Gitblit v1.9.3