From fe65bb1d764ca9d32647818240bb551db06e0b7c Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 30 六月 2025 15:50:04 +0800
Subject: [PATCH] 设备车间管理与用户
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java
index 6df5ebc..5b28948 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/WorkShopDepartServiceImpl.java
@@ -13,9 +13,9 @@
import org.jeecg.modules.eam.mapper.WorkShopDepartMapper;
import org.jeecg.modules.eam.mapper.WorkShopDepartUserMapper;
import org.jeecg.modules.eam.model.EamWorkShopDepartTreeModel;
+import org.jeecg.modules.eam.model.WorkShopIdModel;
import org.jeecg.modules.eam.service.IWorkShopDepartService;
import org.jeecg.modules.eam.util.FindsWorkShopDepartsChildrenUtil;
-import org.jeecg.modules.system.entity.MdcUserProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +46,6 @@
* queryTreeList 瀵瑰簲 queryTreeList 鏌ヨ鎵�鏈夌殑璁惧杞﹂棿绠＄悊鏁版嵁,浠ユ爲缁撴瀯褰㈠紡鍝嶅簲缁欏墠绔�
*/
@Override
- @Cacheable(value = "eam:cache:workShopDepart:alldata")
public List<EamWorkShopDepartTreeModel> queryTreeList() {
LambdaQueryWrapper<WorkShopDepart> query = new LambdaQueryWrapper<WorkShopDepart>();
query.eq(WorkShopDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
@@ -126,6 +125,18 @@
}
}
+ @Override
+ @Cacheable(value = "eam:cache:workshop:allids")
+ public List<WorkShopIdModel> queryProductionIdTreeList() {
+ LambdaQueryWrapper<WorkShopDepart> query = new LambdaQueryWrapper<>();
+ query.eq(WorkShopDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.orderByAsc(WorkShopDepart::getWorkShopOrder);
+ List<WorkShopDepart> list = this.list(query);
+ //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
+ return FindsWorkShopDepartsChildrenUtil.wrapTreeDataToProductionIdTreeList(list);
+ }
+
+
/**
* updateProductionDataById 瀵瑰簲 edit 鏍规嵁璁惧杞﹂棿绠＄悊涓婚敭鏉ユ洿鏂板搴旂殑璁惧杞﹂棿绠＄悊鏁版嵁
*/
--
Gitblit v1.9.3