From 047fb9e27e5b34faeb027190fff28c4f7bb71026 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 04 三月 2025 17:22:36 +0800
Subject: [PATCH] art: 所有设备 台账 三保工单 根据设备id查询三保工单,并过滤掉已完成和已取消的三保工单

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java |    7 +++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml         |    9 +++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index a890121..928009c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -241,6 +241,15 @@
                 #{workCenterId}
             </foreach>
         </if>
+        <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/DailyMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java
index 16bc199..9d0a735 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderServiceImpl.java
@@ -67,6 +67,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().getDailyMaintenanceOrder3List(pageData,params);
     }
 

--
Gitblit v1.9.3