From 1424a070273af9a35ac29ea35943e25591eeaf9d Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Sat, 7 Jun 2025 17:51:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(ems):=20=E4=BF=AE=E5=A4=8D=20dailyfaultreco?=
 =?UTF-8?q?rd=20=E6=8F=92=E5=85=A5=E5=92=8C=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E6=97=B6=E9=95=BF=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了插入语句中的 handling_duration 字段的空值判断
- 在插入和更新语句中增加了对故障发生时间和处理完成时间的判断
- 使用 CASE 语句计算处理时长，考虑了跨天的情况
- 保留了原有的 handlingDuration 字段值作为备用
---
 .../ems/info/DailyFaultRecordMapper.xml       | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml b/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml
index 8e2cd2c..41cb072 100644
--- a/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/info/DailyFaultRecordMapper.xml
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultType != null">fault_type,</if>
             <if test="faultOccurrenceTime != null">fault_occurrence_time,</if>
             <if test="handlingCompletionTime != null">handling_completion_time,</if>
-            <if test="handlingDuration != null">handling_duration,</if>
+            handling_duration,
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="date != null">#{date},</if>
@@ -67,7 +67,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultType != null">#{faultType},</if>
             <if test="faultOccurrenceTime != null">#{faultOccurrenceTime},</if>
             <if test="handlingCompletionTime != null">#{handlingCompletionTime},</if>
-            <if test="handlingDuration != null">#{handlingDuration},</if>
+            <choose>
+                <when test="faultOccurrenceTime != null and handlingCompletionTime != null and faultOccurrenceTime != '' and handlingCompletionTime != ''">
+                    CASE 
+                        WHEN TIME_TO_SEC(#{handlingCompletionTime}) >= TIME_TO_SEC(#{faultOccurrenceTime}) THEN
+                            TIME_TO_SEC(#{handlingCompletionTime}) - TIME_TO_SEC(#{faultOccurrenceTime})
+                        ELSE
+                            TIME_TO_SEC(#{handlingCompletionTime}) + 86400 - TIME_TO_SEC(#{faultOccurrenceTime})
+                    END,
+                </when>
+                <otherwise>
+                    #{handlingDuration},
+                </otherwise>
+            </choose>
          </trim>
     </insert>
 
@@ -83,7 +95,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="faultType != null">fault_type = #{faultType},</if>
             <if test="faultOccurrenceTime != null">fault_occurrence_time = #{faultOccurrenceTime},</if>
             <if test="handlingCompletionTime != null">handling_completion_time = #{handlingCompletionTime},</if>
-            <if test="handlingDuration != null">handling_duration = #{handlingDuration},</if>
+            handling_duration = 
+            <choose>
+                <when test="faultOccurrenceTime != null and handlingCompletionTime != null and faultOccurrenceTime != '' and handlingCompletionTime != ''">
+                    CASE 
+                        WHEN TIME_TO_SEC(#{handlingCompletionTime}) >= TIME_TO_SEC(#{faultOccurrenceTime}) THEN
+                            TIME_TO_SEC(#{handlingCompletionTime}) - TIME_TO_SEC(#{faultOccurrenceTime})
+                        ELSE
+                            TIME_TO_SEC(#{handlingCompletionTime}) + 86400 - TIME_TO_SEC(#{faultOccurrenceTime})
+                    END
+                </when>
+                <otherwise>
+                    #{handlingDuration}
+                </otherwise>
+            </choose>,
         </trim>
         where id = #{id}
     </update>