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/IMdcEquipmentService.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index 76ddd1d..a76ae1a 100644
--- a/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -9,10 +9,7 @@
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
-import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo;
-import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo;
-import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
-import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
+import org.jeecg.modules.mdc.vo.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -111,7 +108,7 @@
/**
* 璁惧鐩戞帶鍒楄〃
*/
- List<MdcEquipmentMonitor> queryEquipmentMonitorList(String userId, String key);
+ List<MdcEquipmentMonitor> queryEquipmentMonitorList(String userId, String key, String status);
/**
* 璁惧鐩戞帶 - 璁惧璇︾粏淇℃伅
@@ -243,4 +240,6 @@
List<String> getEquIdsByProIds(List<String> proIds);
List<MdcEquipment> findByProIds(List<String> proIds);
+
+ MdcBoardEquRealTImeVo getByEquipmentId(String equipmentId);
}
--
Gitblit v1.9.3