From e0043894135b643060c0d661f86a438db25359eb Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Tue, 1 Apr 2025 10:26:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E6=97=B6=E6=95=88=E9=A2=84=E8=AD=A6=E7=8A=B6=E6=80=81=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Warning/TransportWarningService.cs    |  2 --
 .../Transport/TransportWarningDetailsIndex.cs      | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs b/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
index d179707a..f25b817a 100644
--- a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
+++ b/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
@@ -330,7 +330,6 @@ public class TransportWarningService : ApplicationService
         });
     }
 
-
     /// <summary>
     /// 删除运输时效规则场景
     /// </summary>
@@ -360,7 +359,6 @@ public class TransportWarningService : ApplicationService
         return new UnifyResultDto(true);
     }
 
-
     /// <summary>
     /// 编辑预警规则项目（全量）
     /// </summary>
diff --git a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs
index 6ff141b9..b40e2c96 100644
--- a/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs
+++ b/src/SJZY.Track.Domain/Aggregates/WarningAggregate/Transport/TransportWarningDetailsIndex.cs
@@ -127,6 +127,7 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex
     public int CalcStatus(TrackDetailsIndex? startStatusTrack, TrackDetailsIndex? endStatusTrack)
     {
         if (Status == (int) TransportWarningStatus.已关闭) return Status;
+        var isEnd = !string.IsNullOrWhiteSpace(EndTrackContent);
         //时效
         var transportTimeSpan = TimeSpan.FromHours(TransportTimeSpan); //小时
         //预警时效（预警发出的时间对比于最早轨迹状态时间的跨度）
@@ -137,11 +138,20 @@ public sealed class TransportWarningDetailsIndex : IdBaseIndex
 
         //时效>累计运输时间>=预警时效 状态调整为【即将超时】
         if (transportTimeSpan > cumulativeTimeSpan && cumulativeTimeSpan >= startTrackWarningTimeSpan)
-            return Status = (int) TransportWarningStatus.即将超时;
+        {
+            return Status = isEnd
+                ? (int) TransportWarningStatus.已完成
+                : (int) TransportWarningStatus.即将超时;
+        }
+
 
         //时效<累计运输时间 状态调整为【已超时】
         if (transportTimeSpan < cumulativeTimeSpan)
-            return Status = (int) TransportWarningStatus.已超时;
+        {
+            return Status = isEnd
+                ? (int) TransportWarningStatus.超时完成
+                : (int) TransportWarningStatus.已超时;
+        }
 
         return Status;
     }