修复异常

src/Hotline.Share/Dtos/Snapshot/OrderDto.cs

@@ -1970,12 +1970,23 @@ public class OrderSnapshotItemsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public EExpiredStatus ExpiredStatus { get; set; }
+    public EExpiredStatus? ExpiredStatus => FiledTime.CalculateExpiredState(Status, this.ExpiredTime, this.NearlyExpiredTime, this.NearlyExpiredTimeOne);
 
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
+
+    /// <summary>
+    /// 即将超期时间
+    /// </summary>
+    public DateTime? NearlyExpiredTime { get; set; }
+
+    /// <summary>
+    /// 即将超期时间第一级
+    /// </summary>
+    public DateTime? NearlyExpiredTimeOne { get; set; }
+
 
     /// <summary>
     /// 受理编号
@@ -2141,12 +2152,22 @@ public class OrderSnapshotElectrogasItemsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public EExpiredStatus ExpiredStatus { get; set; }
+    public EExpiredStatus? ExpiredStatus => FiledTime.CalculateExpiredState(Status, this.ExpiredTime, this.NearlyExpiredTime, this.NearlyExpiredTimeOne);
 
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
+
+    /// <summary>
+    /// 即将超期时间
+    /// </summary>
+    public DateTime? NearlyExpiredTime { get; set; }
+
+    /// <summary>
+    /// 即将超期时间第一级
+    /// </summary>
+    public DateTime? NearlyExpiredTimeOne { get; set; }
 
     /// <summary>
     /// 受理编号
@@ -2558,7 +2579,7 @@ public class CitizenRewardOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
 
     /// <summary>
     /// 受理编号
@@ -2648,6 +2669,11 @@ public class CitizenRewardOutDto
     /// </summary>
     public bool IsAward { get; set; }
 
+    /// <summary>
+    /// 是否发放补充奖励
+    /// </summary>
+    public string? IsAwardTxt => IsAward ? "是" : "否";
+
     /// <summary>
     /// 追加奖励金额(元)
     /// </summary>

src/Hotline.Share/Dtos/Snapshot/StatisticsDto.cs

@@ -57,7 +57,7 @@ public class RedPackStatisticsDetailsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
 
     /// <summary>
     /// 受理编号
@@ -712,7 +712,7 @@ public class SnapshotStatisticsDetailOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();    
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();    
 
     /// <summary>
     /// 受理编号
@@ -934,7 +934,7 @@ public class HotspotStatisticsDetailsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
 
     /// <summary>
     /// 受理编号
@@ -1292,7 +1292,7 @@ public class SnapshotProcessingStatisticsDetailsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
 
     /// <summary>
     /// 受理编号
@@ -1449,7 +1449,7 @@ public class GuiderWorkStatisticsDetailsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
 
     /// <summary>
     /// 受理编号
@@ -1951,7 +1951,7 @@ public class CommunityStatisticsDetailsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
 
     /// <summary>
     /// 受理编号
@@ -2376,7 +2376,7 @@ public class SnapshotDepartmentAveTimeStatisticsDetailsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
 
     /// <summary>
     /// 受理编号
@@ -2578,7 +2578,7 @@ public class CompliantStatisticsDetailsOutDto
     /// <summary>
     /// 过期状态
     /// </summary>
-    public string ExpiredStatusText => ExpiredStatus.GetDescription();
+    public string ExpiredStatusText => ExpiredStatus?.GetDescription();
 
     /// <summary>
     /// 受理编号