From db8133b419aeceed88dbfc2c48cd35509c782375 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 18 六月 2025 11:48:11 +0800
Subject: [PATCH] 设备故障率和去除故障时间利用率算法调整

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml |   10 +++++++++-
 1 files changed, 9 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..3136e97 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,11 +12,19 @@
             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 &lt; #{startTime} AND t2.actual_end_time IS NULL )
+            )
           AND t3.equipment_code IN
             <foreach collection="equipmentIdList" item="id" index="index" open="(" close=")" separator=",">
                 #{ id }
             </foreach>
           AND t1.report_status != 'ABOLISH'
     </select>
+
+    <select id="getMaxStaticsData" resultType="java.lang.String">
+        SELECT TOP 1 the_date FROM mdc_equipment_fault_info ORDER BY the_date DESC
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3