From c82b14f3a882698cbca62ef168615d31711320ca Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 15:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java |   72 ++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java
similarity index 63%
rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java
rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java
index 2b60d19..90a26bb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/base/service/IEamBaseRepairDepartService.java
@@ -53,41 +53,41 @@
      * 鏍规嵁浜х嚎id鎵归噺鍒犻櫎骞跺垹闄ゅ叾鍙兘瀛樺湪鐨勫瓙绾т骇绾�
      */
     void deleteBatchWithChildren(List<String> ids);
-
-    /**
-     * 鑾峰彇涓嬬骇浜х嚎
-     */
-    List<EamBaseRepairDepart> queryRepDepByPid(String pid);
-
-    /**
-     * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」
-     */
-    List<RepairDepartIdModel> loadMaintainDepartTreeOptions(String userId);
-
-    /**
-     * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
-     */
-    List<String> recursionChildren(String productionId);
-
-    /**
-     * 鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d
-     *
-     * @param userId
-     * @param productionId
-     * @return
-     */
-    String findFirstMaintainDepart(String userId, String productionId);
-
-    /**
-     * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛宸ユ鏉冮檺
-     */
-    String findThreeMaintainDepartId(String userId);
-
-    /**
-     *
-     * @param equipmentId
-     * @return
-     */
-    EamBaseRepairDepart findMaintainDepartList(String equipmentId);
+//
+//    /**
+//     * 鑾峰彇涓嬬骇浜х嚎
+//     */
+//    List<EamBaseRepairDepart> queryRepDepByPid(String pid);
+//
+//    /**
+//     * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」
+//     */
+//    List<RepairDepartIdModel> loadMaintainDepartTreeOptions(String userId);
+//
+//    /**
+//     * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
+//     */
+//    List<String> recursionChildren(String productionId);
+//
+//    /**
+//     * 鏍规嵁鐢ㄦ埛id鍜岃溅闂磇d鑾峰彇鐢ㄦ埛鎷ユ湁鐨勮溅闂磇d
+//     *
+//     * @param userId
+//     * @param productionId
+//     * @return
+//     */
+//    String findFirstMaintainDepart(String userId, String productionId);
+//
+//    /**
+//     * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛宸ユ鏉冮檺
+//     */
+//    String findThreeMaintainDepartId(String userId);
+//
+//    /**
+//     *
+//     * @param equipmentId
+//     * @return
+//     */
+//    EamBaseRepairDepart findMaintainDepartList(String equipmentId);
     
 }

--
Gitblit v1.9.3