From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java | 7 +++++++
1 files changed, 7 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 62e7c98..a989f0c 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
@@ -64,12 +64,15 @@
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,
@Param("model")String model,
@Param("workCenterId")String workCenterId,
@Param("factoryModelId")String factoryModelId,
+ @Param("areaId")String areaId,
@Param("manageId")String manageId,
@Param("useId")String useId,
@Param("equipmentImportanceId")String equipmentImportanceId,
@@ -79,6 +82,10 @@
@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