From 3b799baccf74c16e1fad96fedfcbef0b87e31bcc Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Mon, 24 Mar 2025 18:04:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=9B=9E?=
 =?UTF-8?q?=E4=BC=A0=E9=A2=84=E8=AD=A6=E6=97=B6=E9=97=B4=E8=B7=A8=E5=BA=A6?=
 =?UTF-8?q?e.g=2000=E5=A4=A900=E5=B0=8F=E6=97=B600=E5=88=86=E9=92=9F=20/?=
 =?UTF-8?q?=20--?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/Warning/Return/ReturnWarningDetailsDto.cs | 12 ++++++------
 .../Services/Warning/ReturnWarningService.cs       | 14 +++++++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs
index 960e3ae2..06867d52 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/Warning/Return/ReturnWarningDetailsDto.cs
@@ -119,19 +119,19 @@ public sealed class ReturnWarningDetailsDto
     // todo:计算属性
 
     /// <summary>
-    /// 实际回传用时（单位毫秒）
+    /// 实际回传用时（单位毫秒）e.g 00天00小时00分钟 / --
     /// </summary>
-    public long? ActualReturnTimeSpan { get; set; }
+    public string ActualReturnTimeSpan { get; set; }
 
     /// <summary>
-    /// 系统回传用时（单位毫秒）
+    /// 系统回传用时（单位毫秒）e.g 00天00小时00分钟 / --
     /// </summary>
-    public long? SystemReturnTimeSpan { get; set; }
+    public string SystemReturnTimeSpan { get; set; }
 
     /// <summary>
-    /// 轨迹创建用时（单位毫秒）
+    /// 轨迹创建用时（单位毫秒）e.g 00天00小时00分钟 / --
     /// </summary>
-    public long TrackCreateTimeSpan { get; set; }
+    public string TrackCreateTimeSpan { get; set; }
 
     /// <summary>
     /// 是否有KPI考核
diff --git a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs
index e502d63f..46f8d84e 100644
--- a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs
+++ b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs
@@ -145,9 +145,9 @@ public class ReturnWarningService : ApplicationService
             PushTrackStatus = x.PushTrackStatus,
             PushTrackContent = x.PushTrackContent,
             // todo:计算属性
-            ActualReturnTimeSpan = x.ActualReturnTimeSpan,
-            SystemReturnTimeSpan = x.SystemReturnTimeSpan,
-            TrackCreateTimeSpan = x.TrackCreateTimeSpan,
+            ActualReturnTimeSpan = FormatTimeSpan(x.ActualReturnTimeSpan),
+            SystemReturnTimeSpan = FormatTimeSpan(x.SystemReturnTimeSpan),
+            TrackCreateTimeSpan = FormatTimeSpan(x.TrackCreateTimeSpan),
 
             // 具体描述
             TrackReturnTime = x.TrackReturnTime,
@@ -192,6 +192,14 @@ public class ReturnWarningService : ApplicationService
             var flag = timezone > 0f ? "+" : "";
             return $"GMT {flag}{timeZoneStr.RemovePostFix(":00")}";
         }
+
+        // 时间
+        string FormatTimeSpan(long? milliseconds)
+        {
+            if (!milliseconds.HasValue) return GlobalConst.EmptyString;
+            var timeSpan = TimeSpan.FromMilliseconds(milliseconds.Value);
+            return $"{timeSpan.Days:00}天{timeSpan.Hours:00}小时{timeSpan.Minutes:00}分钟";
+        }
     }
 
     /// <summary>