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/RepairOrderMapper.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
index 6e65ac6..fae1b4a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java
@@ -6,6 +6,7 @@
import org.jeecg.modules.eam.entity.RepairOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -26,6 +27,7 @@
* @return
*/
List<RepairOrder> getRepairOrderList(Page<RepairOrder> page,
+ @Param("id")String id,
@Param("num") String num,
@Param("equipmentNum") String equipmentNum,
@Param("equipmentName") String equipmentName,
@@ -34,7 +36,16 @@
@Param("equipmentCategoryId") String equipmentCategoryId,
@Param("factoryModelId") String factoryModelId,
@Param("specificEquipment") String specificEquipment,
- @Param("teamId") String teamId
+ @Param("teamId") String teamId,
+ @Param("equipNums") List<String> equipNums,
+ @Param("repairOrderUda1") String repairOrderUda1,
+ @Param("faultStartTime") Date faultStartTime,
+ @Param("faultEndTime")Date faultEndTime,
+ @Param("createStartTime")Date createStartTime,
+ @Param("createEndTime")Date createEndTime,
+ @Param("equipmentImportanceId")String equipmentImportanceId
+
+
);
IPage<Map<String, Object>> getUserTeam(IPage<Map> pageData, @Param("realname") String realname);
--
Gitblit v1.9.3