From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 14:04:24 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardDetailController.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 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 52c547e..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.*; @@ -55,6 +57,9 @@ @Autowired private ISysBaseAPI sysBaseApi; + + @Autowired + private IEamEquipmentService equipmentService; /** * 鍒嗛〉鍒楄〃鏌ヨ @@ -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