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/entity/RepairOrder.java | 4 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml | 9 +++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/RepairOrderMapper.java | 4 +++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/RepairOrderServiceImpl.java | 10 +++++++++-
5 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
index 5a0f8fd..5a753b2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
@@ -378,6 +378,8 @@
repairOrder.getCreateEndTime(),
repairOrder.getEquipmentImportanceId(),
repairOrder.getFaultCause(),
+ null,
+ null,
null
);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
index fcf29ab..d40a1c6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/RepairOrder.java
@@ -320,6 +320,6 @@
@TableField(exist = false)
private List<Map<String, Object>> equipmentFaultCause;
-
-
+ @TableField(exist = false)
+ private String statusEnums;
}
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 c854be1..3d4b9e2 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
@@ -45,7 +45,9 @@
@Param("createEndTime")Date createEndTime,
@Param("equipmentImportanceId")String equipmentImportanceId,
@Param("faultCause")String faultCause,
- @Param("workCenterIds")List<String> workCenterIds
+ @Param("workCenterIds")List<String> workCenterIds,
+ @Param("equipmentId") String equipmentId,
+ @Param("statusEnums") List<String> statusEnums
);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index 3d66031..970ade3 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -129,6 +129,15 @@
#{workCenterId}
</foreach>
</if>
+ <if test="equipmentId != null">
+ and t1.equipment_id = #{equipmentId}
+ </if>
+ <if test="statusEnums != null">
+ and t1.status not in
+ <foreach collection="statusEnums" open="(" separator="," close=")" item="statusEnum">
+ #{statusEnum}
+ </foreach>
+ </if>
order by t1.create_time desc
</select>
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