From 0976769f6ecc75e26c9de48f23e7fcd46d858560 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 24 六月 2025 17:40:26 +0800
Subject: [PATCH] 设备管理-大修项修
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
index fec2b60..964540d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
@@ -198,10 +198,18 @@
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 = #{equipmentId}
AND t1.report_status != 'ABOLISH'
</select>
+ <select id="getFirstRecord" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection">
+ SELECT TOP 1 * FROM mdc_equipment_running_section ORDER BY start_time
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3