From dfadab4fecc90bd2ad720dc67eba44c4b69b155a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 05 三月 2025 10:05:40 +0800
Subject: [PATCH] art: 所有设备 台账 维修工单 根据设备id查询维修工单,并过滤掉已完成的维修工单

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
index 3c67ca7..df0bab1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java
@@ -121,6 +121,12 @@
         if(StringUtils.isNotBlank(repairOrder.getNums())){
         	equipNums = Arrays.asList(repairOrder.getNums().trim().split("\n")).stream().filter(num->!num.equals("\n")).collect(Collectors.toList());
 		}
+		//鐘舵�佺瓫閫�
+		List<String> statusEnumList = null;
+		if(repairOrder.getStatusEnums() != null && StringUtils.isNotBlank(repairOrder.getStatusEnums())) {
+			String[] statusEnums = repairOrder.getStatusEnums().split(",");
+			statusEnumList = Arrays.asList(statusEnums);
+		}
 		return page.setRecords(baseMapper.getRepairOrderList(page,
 				repairOrder.getId(),
 				repairOrder.getNum(),
@@ -140,7 +146,9 @@
 				repairOrder.getCreateEndTime(),
 				repairOrder.getEquipmentImportanceId(),
 				repairOrder.getFaultCause(),
-				workCenterIds
+				workCenterIds,
+				repairOrder.getEquipmentId(),
+				statusEnumList
 				));
 	}
 

--
Gitblit v1.9.3