From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java |   87 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 87 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
index df9cba2..d5d6e64 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java
@@ -4,8 +4,10 @@
 import org.jeecg.modules.system.entity.MdcProduction;
 import org.jeecg.modules.system.model.MdcProductionTreeModel;
 import org.jeecg.modules.system.model.ProductionIdModel;
+import org.jeecg.modules.system.vo.MdcProOptionsVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 浜х嚎琛�
@@ -19,6 +21,11 @@
      * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
      */
     List<MdcProductionTreeModel> queryTreeList();
+
+    /**
+     * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず(娣诲姞绯荤粺閰嶇疆)
+     */
+    List<MdcProductionTreeModel> queryTreeListByConfig();
 
     /**
      * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
@@ -61,6 +68,11 @@
     List<MdcProduction> queryProdByPid(String pid);
 
     /**
+     * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣
+     */
+    List<MdcProduction> recursionChildrenByPid(String pid);
+
+    /**
      * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」
      */
     List<ProductionIdModel> loadProductionTreeOptions(String userId);
@@ -98,4 +110,79 @@
      * @return
      */
     List<String> findListParentTree(String parentId,List<String> stringList);
+
+    /**
+     * 鑾峰彇鐢ㄦ埛鎵�鍦ㄧ殑閮ㄩ棬
+     * @param userId
+     * @return
+     */
+    Map<String, MdcProduction> getUserAssignedDepart(String userId);
+
+    /**
+     * 閫氳繃涓�缁刬d鑾峰彇閮ㄩ棬
+     * @param ids
+     * @return
+     */
+    List<String> findAllProductionIds(List<String> ids);
+
+    /**
+     * 鑾峰彇鏌愪釜鑺傜偣鎵�鏈変笂绾ц妭鐐圭殑id
+     * @param parentId 鐖惰妭鐐� id
+     * @param idList 鎺ユ敹缁撴灉闆�
+     * @return
+     */
+    List<String> findParentIdsForProduction(String parentId, List<String> idList);
+
+    /**
+     * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
+     */
+    List<MdcProductionTreeModel> queryTreeListByMdc(String ids);
+
+    /**
+     * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず
+     */
+    List<MdcProductionTreeModel> queryTreeListByMdc();
+
+    /**
+     * 鏌ヨ瀛愯妭鐐�
+     * @param mdcProductionIds
+     * @return
+     */
+    List<String> findChildren(List<String> mdcProductionIds);
+
+    /**
+     * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎(涓績)鎴栫彮缁勪笅鎷夐�夐」
+     * @param userId
+     * @param productionId
+     * @return
+     */
+    List<MdcProOptionsVo> loadProductionOptions(String userId, String productionId);
+
+    List<MdcProduction> findMdcPros(String userId, String productionId);
+
+    /**
+     *
+     * @param userId
+     * @param productionId
+     * @return
+     */
+    List<MdcProOptionsVo> loadTeamOptions(String userId, String productionId);
+
+    /**
+     *
+     * @param userId
+     * @param allProductionIds
+     * @return
+     */
+    List<String> findProIdsByUId(String userId, List<String> allProductionIds);
+
+    /**
+     *
+     * @param productionId
+     * @return
+     */
+    List<String> findChildByProId(String productionId);
+
+
+    String findProName(String equipmentId);
 }

--
Gitblit v1.9.3