From b5d02520af582a86aa95d7903558a5bf50a77aa7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 17 六月 2025 16:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 dd35b9f..b2eeea9 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
@@ -188,5 +188,24 @@
equipment_id, start_time DESC
</select>
+ <select id="findFaultList" resultType="org.jeecg.modules.mdc.vo.EquFaultRecord">
+ SELECT
+ t3.equipment_code equipmentId,
+ t1.fault_start_time startTime,
+ t2.actual_end_time endTime
+ FROM
+ eam_report_repair t1
+ 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} )
+ OR ( t1.fault_start_time < #{startTime} AND t2.actual_end_time IS NULL )
+ )
+ AND t3.equipment_code = #{equipmentId}
+ AND t1.report_status != 'ABOLISH'
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3