From a7ad8c17aa069e723aa0a813cf198d07e67b5fb5 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 14 三月 2025 14:19:08 +0800 Subject: [PATCH] 新增刀具、设备类信息管理,新增结构树优化,优化权限分配,新增双控设备结构书 修改flow模块 删除部分废弃yml配置 --- lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/IMdcProductionService.java | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 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 cfd203d..3e2608e 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 @@ -6,6 +6,7 @@ import org.jeecg.modules.system.model.ProductionIdModel; import java.util.List; +import java.util.Map; /** * @Description: 浜х嚎琛� @@ -19,6 +20,11 @@ * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず */ List<MdcProductionTreeModel> queryTreeList(); + + /** + * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず(娣诲姞绯荤粺閰嶇疆) + */ + List<MdcProductionTreeModel> queryTreeListByConfig(); /** * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず @@ -61,6 +67,11 @@ List<MdcProduction> queryProdByPid(String pid); /** + * 閫掑綊鏌ヨ鎵�鏈夊瓙鑺傜偣 + */ + List<MdcProduction> recursionChildrenByPid(String pid); + + /** * 鏍规嵁鐢ㄦ埛id鑾峰彇浜х嚎涓嬫媺鏍戦�夐」 */ List<ProductionIdModel> loadProductionTreeOptions(String userId); @@ -83,4 +94,33 @@ * 鏍规嵁鐢ㄦ埛id鏌ヨ鐢ㄦ埛宸ユ鏉冮檺 */ String findThreeProductionId(String userId); + + /** + * 鏌ヨ鎵�鏈夌埗鑺傜偣鍜屾湰鑺傜偣鍚嶇О + * @param id + * @return + */ + List<String> findListParentTreeAll(String id); + + /** + * 鏌ヨ鎵�鏈夌埗鑺傜偣鍚嶇О + * @param parentId + * @param stringList + * @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); } -- Gitblit v1.9.3