合并

src/Hotline.Application/Orders/OrderApplication.cs

@@ -549,13 +549,17 @@ public class OrderApplication : IOrderApplication, IScopeDependency
         var result = new List<PublishedOrderStatisticsDto>();
         foreach (var item in items)
         {
+            var privateItem = privateCount?.Where(m => m.Id == item.Id).FirstOrDefault();
+            var publicItem = publicCount?.Where(m => m.Id == item.Id).FirstOrDefault();
             var statisticsDto = new PublishedOrderStatisticsDto
             {
                 Name = item.Name,
                 TotalCount = item.Count,
-                PrivateCount = privateCount.Where(m => m.Id == item.Id).FirstOrDefault()?.Count ?? 0,
-                PublicCount = publicCount.Where(m => m.Id == item.Id).FirstOrDefault()?.Count ?? 0,
+                PrivateCount = privateItem?.Count ?? 0,
+                PublicCount = publicItem?.Count ?? 0,
             };
+            if (publicItem is not null) statisticsDto.PublishTime = publicItem.CreationTime;
+            if (privateItem is not null) statisticsDto.PublishTime = privateItem.CreationTime;
             statisticsDto.WaitCount = statisticsDto.TotalCount - statisticsDto.PrivateCount - statisticsDto.PublicCount;
             result.Add(statisticsDto);
         }
@@ -573,7 +577,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             {
                 Count = SqlFunc.AggregateCount(order.Id),
                 Id = SqlFunc.AggregateMax(order.ActualHandleOrgCode),
-                Name = SqlFunc.AggregateMax(order.ActualHandleOrgName)
+                Name = SqlFunc.AggregateMax(order.ActualHandleOrgName),
+                CreationTime = SqlFunc.AggregateMax(publish.CreationTime)
             })
             .ToListAsync();
     }

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

@@ -62,6 +62,11 @@ public class PublishedOrderStatisticsDto
     /// 名字
     /// </summary>
     public string Name { get; set; }
+
+    /// <summary>
+    /// 发布时间
+    /// </summary>
+    public DateTime PublishTime { get; set; }
 }
 
 public class QueryPublishedOrderDataDto
@@ -80,6 +85,11 @@ public class QueryPublishedOrderDataDto
     /// 数量
     /// </summary>
     public int Count { get; set; }
+
+    /// <summary>
+    /// 发布时间
+    /// </summary>
+    public DateTime CreationTime { get; set; }
 }
 
 public class PublishDto : OrderDto