Merge branch 'release_20250214' of Fengwo/hotline into release

修复综合查询中办理时长为空

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

@@ -139,19 +139,23 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public double AllDuration { get; set; }
 
+        /// <summary>
+        /// 全流程时长小时
+        /// </summary>
+        public string AllDurationHour => GetAllDurationHour();
 
-        public string AllDurationHour { get; set; }
-
-        //
-        // public string GetAllDurationHour()
-        // {
-        //     if (Status >= EOrderStatus.Filed && FiledTime.HasValue)
-        //     {
-        //         return Math.Round(Math.Round((FiledTime - CreationTime).Value.TotalSeconds) / 60 / 60, 2).ToString() + "小时";
-        //     }
-        //
-        //     return "-";
-        // }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public string GetAllDurationHour()
+        {
+            if (CreationTimeHandleDurationWorkday > 0)
+            {
+                return Math.Round(Math.Round(CreationTimeHandleDurationWorkday.Value) / 60 / 60, 2).ToString() + "";
+            }
+            return "0.00";
+        }
 
         /// <summary>
         /// 办结时长（秒） 归档时间-受理时间（工单创建时间）

src/Hotline/Orders/Order.cs

@@ -173,32 +173,32 @@ namespace Hotline.Orders
         [SugarColumn(ColumnDescription = "标题")]
         public string Title { get; set; }
 
-		#region 工单标签（自贡）
-		/// <summary>
-		/// 工单标签（自贡）-- 弃用
-		/// </summary>
-		[SugarColumn(ColumnDescription = "工单标签-- 弃用")]
-		public string? OrderTag { get; set; }
+        #region 工单标签（自贡）
+        /// <summary>
+        /// 工单标签（自贡）-- 弃用
+        /// </summary>
+        [SugarColumn(ColumnDescription = "工单标签-- 弃用")]
+        public string? OrderTag { get; set; }
 
-		[SugarColumn(ColumnDescription = "工单标签代码")]
-		public string? OrderTagCode { get; set; }
+        [SugarColumn(ColumnDescription = "工单标签代码")]
+        public string? OrderTagCode { get; set; }
 
 
 
-		/// <summary>
-		/// 工单标签
-		/// </summary>
-		[Navigate(typeof(OrderRelationTag), nameof(OrderRelationTag.OrderId), nameof(OrderRelationTag.TagId))]
-		public List<SystemDicData> OrderTags { get; set; }
+        /// <summary>
+        /// 工单标签
+        /// </summary>
+        [Navigate(typeof(OrderRelationTag), nameof(OrderRelationTag.OrderId), nameof(OrderRelationTag.TagId))]
+        public List<SystemDicData> OrderTags { get; set; }
 
-		#endregion
+        #endregion
 
-		#region 热点
+        #region 热点
 
-		/// <summary>
-		/// 热点
-		/// </summary>
-		[SugarColumn(ColumnDescription = "热点ID")]
+        /// <summary>
+        /// 热点
+        /// </summary>
+        [SugarColumn(ColumnDescription = "热点ID")]
         public string? HotspotId { get; set; }
 
         //public string? HotspotCode { get; set; }
@@ -474,7 +474,7 @@ namespace Hotline.Orders
         public double? AllDurationWorkday { get; set; }
 
 
-        public string? AllDurationHour { get; set; }
+        //public string? AllDurationHour { get; set; }
 
         /// <summary>
         /// 办理时间限制(如：24小时、7个工作日)