From e4bc8d8c824b9cbe38f87a136d25e70ce34b7eff Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 07 五月 2025 16:51:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index b508ae8..dee8a83 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -235,6 +235,30 @@
return eamEquipmentMapper.selectOne(queryWrapper);
}
+ @Override
+ public List<EamEquipment> queryByProductionId(String productionId) {
+ QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
+ //杞﹂棿涓虹┖ 鍒欐煡璇㈡墍鏈夎澶�
+ if (StringUtils.isNotBlank(productionId)) {
+ //杞﹂棿缂栫爜涓嶄负绌�
+ List<String> productIds = mdcProductionService.recursionChildren(productionId);
+ if (CollectionUtil.isEmpty(productIds)) {
+ return Collections.emptyList();
+ }
+ if(productIds.size() == 1) {
+ queryWrapper.eq("e.org_id", productIds.get(0));
+ }else {
+ queryWrapper.in("e.org_id", productIds);
+ }
+ }
+ queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
+ List<EamEquipment> list = eamEquipmentMapper.queryByProductionIds(queryWrapper);
+ if(CollectionUtil.isNotEmpty(list)) {
+ return list;
+ }
+ return Collections.emptyList();
+ }
+
/**
* 鑾峰彇鎵�鏈夌殑浜х嚎id锛堝寘鍚墍鏈変笂绾э級
*/
--
Gitblit v1.9.3