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/mapper/xml/EamEquipmentMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index 2b4251a..fc2084d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -165,13 +165,14 @@
mom_eam_equipment t1
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'equipment_status' ) t2 ON t1.equipment_status = t2.item_value
WHERE t1.del_flag = '0'
- <if test="params.num != 'null' and params.num != ''">
- and t1.num like concat('%',#{params.num},'%')
- </if>
- <if test="params.name != 'null' and params.name != ''">
- and t1.name like concat('%',#{params.name},'%')
- </if>
+
</select>
+ <!-- <if test="params.num != 'null' and params.num != ''">-->
+ <!-- and t1.num like concat('%',#{params.num},'%')-->
+ <!-- </if>-->
+ <!-- <if test="params.name != 'null' and params.name != ''">-->
+ <!-- and t1.name like concat('%',#{params.name},'%')-->
+ <!-- </if>-->
<select id="getEquipmentList" resultType="org.jeecg.modules.eam.entity.Equipment">
select
t1.id id,
@@ -405,6 +406,9 @@
t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
t1.technology_status_qualification_time technologyStatusQualificationTime,
t1.technology_status_verification_type technologyStatusVerificationType,
+ t1.second_maintenance_time secondMaintenanceTime,
+ t1.third_maintenance_time thirdMaintenanceTime,
+ t1.next_third_maintenance_time nextThirdMaintenanceTime,
t1.line_id lineId,
t1.is_meta isMeta,
t1.id showId,
--
Gitblit v1.9.3