From ed32b4831acf1612d23015d85ff4a14db7f9f77d Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期三, 16 七月 2025 15:07:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index 5f44a71..e7a1088 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -409,12 +409,12 @@
* 璁惧鐩戞帶鍒楄〃
*/
@Override
- public List<MdcEquipmentMonitor> queryEquipmentMonitorList(String userId, String key) {
+ public List<MdcEquipmentMonitor> queryEquipmentMonitorList(String userId, String key, String status) {
List<String> equipmentIds = this.getEquipmentIdsProduction(userId, key);
if (equipmentIds == null || equipmentIds.isEmpty()) {
return Collections.emptyList();
}
- List<MdcEquipmentMonitor> result = this.baseMapper.checkStatusFromEquipmentIds(equipmentIds);
+ List<MdcEquipmentMonitor> result = this.baseMapper.checkStatusFromEquipmentIds(equipmentIds, status);
if (result != null && !result.isEmpty()) {
for (MdcEquipmentMonitor mdcEquipmentMonitor : result) {
if (mdcEquipmentMonitor.getOporation() != null) {
@@ -1052,4 +1052,9 @@
return this.baseMapper.findByProIds(proIds);
}
+ @Override
+ public MdcBoardEquRealTImeVo getByEquipmentId(String equipmentId) {
+ return this.baseMapper.getByEquipmentId(equipmentId);
+ }
+
}
--
Gitblit v1.9.3