From f012fc079c5f0d11be14db18f73bfa38b1b38a94 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 04 三月 2025 16:12:33 +0800
Subject: [PATCH] art: 所有设备 台账 点检工单 根据设备id查询点检工单,并过滤掉已完成和已取消的点检工单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java | 7 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml | 6 ++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
index f6b9944..8aaddd1 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml
@@ -81,6 +81,12 @@
<if test="params.equipmentId != null">
and t1.equipment_id = #{params.equipmentId}
</if>
+ <if test="params.statusEnums != null">
+ and t1.status not in
+ <foreach collection="params.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/InspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
index 6fcf60b..bdeacb2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/InspectionOrderServiceImpl.java
@@ -56,6 +56,13 @@
workCenterIds = Arrays.asList(split);
params.put("workCenterIds",workCenterIds);
}
+ //鐘舵�佺瓫閫�
+ List<String> statusEnumList = null;
+ if(params.get("statusEnums") != null && StringUtils.isNotBlank(params.get("statusEnums").toString())) {
+ String[] statusEnums = params.get("statusEnums").toString().split(",");
+ statusEnumList = Arrays.asList(statusEnums);
+ params.put("statusEnums",statusEnumList);
+ }
return super.getBaseMapper().getInspectionOrderList(pageData,params);
}
--
Gitblit v1.9.3