From d88b7402ecf5f6b3dd14636db5bcde3b847d8f0a Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期三, 28 五月 2025 17:48:23 +0800
Subject: [PATCH] 设备添加安装位置，调整设备利用率中开始时间加关机时间不等于24的问题
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
index 4623e8a..35b2997 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamMaintenanceStandardController.java
@@ -168,8 +168,10 @@
@ApiOperation(value = "淇濆吇鏍囧噯-鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯", notes = "淇濆吇鏍囧噯-鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯")
@GetMapping(value = "/listByUser")
public Result<?> listByUser(@RequestParam(name = "keyword", required = false) String keyword,
+ @RequestParam(name = "equipmentId", required = false) String equipmentId,
+ @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize,
@RequestParam(name = "maintenanceCategory", required = false) String maintenanceCategory) {
- List<EamMaintenanceStandard> list = eamMaintenanceStandardService.queryListBykeywordAndCategory(keyword, maintenanceCategory);
+ List<EamMaintenanceStandard> list = eamMaintenanceStandardService.queryListByKeywordAndCategory(keyword, equipmentId, pageSize, maintenanceCategory);
return Result.OK(list);
}
--
Gitblit v1.9.3