From dd890a133f35b4b21ed00ec557ca83f733ff04dc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 03 九月 2025 18:03:24 +0800
Subject: [PATCH] 实现二保三保规范一个Word文档中包含多个保养内容（即多个设备）导入
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
index b320af0..995c161 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamMaintenanceStandardService.java
@@ -52,7 +52,7 @@
* @param maintenanceCategory 淇濆吇绫诲瀷
* @return
*/
- EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory);
+ EamMaintenanceStandard checkDuplicate(String equipmentId, String maintenanceCategory,String standardStatus);
/**
* 鏌ヨ鏍囧噯鍒楄〃-鍓嶇灞曠ず璇ョ敤鎴锋嫢鏈夌殑鏍囧噯
@@ -87,8 +87,22 @@
/**
* 鐐规琛ㄥ鍏ュ叆鍙�
*/
- public Result<?> importPointInspectionExcel(MultipartFile file);
+ Result<?> importPointInspectionExcel(MultipartFile file,String id);
+ /**
+ * 浜屼繚/涓変繚瀵煎叆
+ * @param file
+ * @param type
+ * @param id
+ * @return
+ */
+ Result<?> importMaintenanceStandard(MultipartFile file, String type,String id);
- Result<?> importMaintenanceStandard(MultipartFile file, String type);
+ /**
+ * 鏌ヨ淇濆吇绫诲瀷涓嬫甯哥殑淇濆吇鏍囧噯
+ * @param equipmentId 璁惧缂栧彿
+ * @param maintenanceCategory 淇濆吇绫诲瀷
+ * @return
+ */
+ EamMaintenanceStandard queryByEquipmentIdAndCategory(String equipmentId, String maintenanceCategory);
}
--
Gitblit v1.9.3