From 3858c775f565df000a45afd9a0c38c7b6bb39069 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期六, 07 十月 2023 15:07:58 +0800
Subject: [PATCH] 工厂模型 设备ABC修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
index 5522fdf..6e29d15 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java
@@ -104,27 +104,8 @@
List<Map<String, Object>> records = maintenanceStandardList.getRecords();
for (Map<String, Object> record : records) {
String maintenanceStandardId = (String) record.get("id");
- List<Map<String, Object>> maintenanceStandardDetaillist = maintenanceStandardDetailService.getMaintenanceStandardDetailList(maintenanceStandardId);
-// for (Map<String, Object> detail : maintenanceStandardDetaillist) {
-// //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
-//// List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String)detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
-// List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null);
-// if (sysUploadRelas.size() > 0) {
-// detail.put("isNoPhotoFlag", true);
-//// List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo");
-// List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo");
-// SysUpload upload = new SysUpload();
-// if (CollectionUtils.isNotEmpty(uploadRelas)) {
-//// upload = uploadService.getById(uploadRelas.get(0).getUploadId());
-// upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
-// }
-// detail.put("upload", upload);
-// } else {
-// detail.put("isNoPhotoFlag", false);
-// SysUpload upload = new SysUpload();
-// detail.put("upload", upload);
-// }
-// }
+ String equipmentId = (String) record.get("equipmentId");
+ List<Map<String, Object>> maintenanceStandardDetaillist = maintenanceStandardDetailService.getMaintenanceStandardDetailList(maintenanceStandardId,equipmentId);
record.put("maintenanceStandardDetaillist", maintenanceStandardDetaillist);
}
return Result.ok(maintenanceStandardList);
--
Gitblit v1.9.3