From e0656e2efef08e662eb4d33dafd601ce054597cf Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 29 十二月 2023 15:01:17 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
index d70061b..aa0caac 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentService.java
@@ -10,7 +10,9 @@
import org.jeecg.modules.mdc.entity.MdcEquipmentMonitor;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
import org.jeecg.modules.mdc.vo.MdcEquipmentVo;
+import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -162,4 +164,16 @@
* 鏍规嵁閮ㄩ棬灞傜骇鏌ヨ璁惧鍗曚釜
*/
MdcEquipment getEquipmentByDepPid(String pid, String userId);
+
+ /**
+ * 鏍规嵁澶у睆杞﹂棿id鏌ヨ璁惧鍒楄〃
+ */
+ IPage<MdcEquipment> getEquipmentByWorkshopId(Page<MdcEquipment> page, WorkshopEquipmentVo workshopEquipmentVo);
+
+ List<String> listEquipmentId(String equipmentType, List<String> equipmentIdList);
+
+ /**
+ * 鍒楄〃鏌ヨ
+ */
+ IPage<MdcEquipment> pageList(Page<MdcEquipment> page, MdcEquipmentVo mdcEquipment, HttpServletRequest req);
}
--
Gitblit v1.9.3