From 848e5624f3a814763e81db5d79d8f0761c5bb4f1 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 01 二月 2024 10:25:40 +0800
Subject: [PATCH] 设备管理按照车间筛选和导出

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
index 0efbd24..5f134ef 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.eam.entity.DailyInspectionStandardDetail;
 import org.jeecg.modules.eam.entity.Equipment;
 import org.jeecg.modules.eam.model.DepartVo;
 
@@ -63,6 +64,8 @@
 
     IPage<Equipment> pageEquipment(IPage<Map> pageData,@Param("params") Map<String, Object> params);
 
+    IPage<Map<String, Object>> getEquipmentListAllStandard(IPage<Map> pageData, @Param("params") Map<String,Object> params);
+
     List<Equipment> getEquipmentList(   Page<Equipment> page,
                                        @Param("num") String num,
                                        @Param("name")String name,
@@ -77,6 +80,12 @@
                                        @Param("specificEquipment")String specificEquipment,
                                        @Param("warrantyStart")Date warrantyStart,
                                        @Param("warrantyEnd")Date warrantyEnd,
+                                        @Param("lineId")String lineId,
+                                        @Param("isLineEquip")String isLineEquip,
+                                       @Param("isLine")String isLine,
+                                        @Param("equipmentCategoryId")String equipmentCategoryId,
+                                       @Param("equipNums") List<String> equipNums,
                                        @Param("sql")String sql
     );
+    List<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId,@Param("type")String type);
 }

--
Gitblit v1.9.3