From 777dded0826a78d09e050f69652dcbba9676bd8a Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 17 六月 2025 13:15:56 +0800
Subject: [PATCH] 调整查询保修记录sql
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml
index 6bf12b9..35d17f7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml
@@ -12,7 +12,11 @@
LEFT JOIN eam_repair_order t2 ON t2.report_id = t1.id
LEFT JOIN eam_equipment t3 ON t1.equipment_id = t3.id
WHERE
- ( ( t1.fault_start_time BETWEEN #{startTime} AND #{endTime} ) OR ( t2.actual_end_time BETWEEN #{startTime} AND #{endTime} ) )
+ (
+ ( t1.fault_start_time BETWEEN #{startTime} AND #{endTime} )
+ OR ( t2.actual_end_time BETWEEN #{startTime} AND #{endTime} )
+ OR ( t1.fault_start_time < #{startTime} AND t2.actual_end_time IS NULL )
+ )
AND t3.equipment_code IN
<foreach collection="equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
#{ id }
--
Gitblit v1.9.3