From 218ab860ed4708f6f70a519775c56c9554000fe7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 13:42:41 +0800
Subject: [PATCH] 去除多余引用
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java
index 2058084..d208997 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java
@@ -16,9 +16,11 @@
import org.jeecg.common.system.base.entity.SysUploadRela;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.StrUtils;
+import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import org.jeecg.modules.eam.model.MaintenanceCycleVo;
import org.jeecg.modules.eam.model.MaintenanceModeVo;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IMaintenanceStandardDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -56,6 +58,9 @@
@Autowired
private ISysBaseAPI sysBaseApi;
+ @Autowired
+ private IEamEquipmentService equipmentService;
+
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -81,27 +86,27 @@
@GetMapping("getMaintenanceStandardList")
public Result<?> getMaintenanceStandardList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
IPage<Map<String, Object>> maintenanceStandardDetails = maintenanceStandardDetailService.getMaintenanceStandardDetailById(pageNo, pageSize, params);
- for (Map<String, Object> detail : maintenanceStandardDetails.getRecords()) {
- //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
-// 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);
- }
- }
+// for (Map<String, Object> detail : maintenanceStandardDetails.getRecords()) {
+// //鑾峰彇鏄惁鏈夋棤寮傚父鐓х墖鏁版嵁
+//// 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);
+// }
+// }
return Result.ok(maintenanceStandardDetails);
}
@@ -148,6 +153,17 @@
}
/**
+ * 鍛ㄦ湡鎬т繚鍏� 鏍规嵁璁惧鍙拌处ABC鏍囪瘑鑾峰彇涓変繚淇濆吇鍛ㄦ湡
+ * @return
+ */
+ @GetMapping("getPeriodicMaintenanceCycle")
+ public Result<?> getPeriodicMaintenanceCycle(@RequestParam("equipmentId") String equipmentId) {
+ Equipment equipment = equipmentService.getById(equipmentId);
+ List<MaintenanceCycleVo> maintenanceCycles = maintenanceStandardDetailService.getPeriodicMaintenanceCycle(equipment.getEquipmentImportanceId());
+ return Result.ok(maintenanceCycles);
+ }
+
+ /**
* 淇濆吇鏂瑰紡
* qsw 2023-5-5
*/
--
Gitblit v1.9.3