tempcommit

src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -3052,11 +3052,26 @@ namespace Hotline.Api.Controllers.Bi
             dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
             _orderRepository.Queryable()
                 .Includes(x => x.OrderScreens)
-                .Where(x => x.HotspotId.StartsWith(dto.HotspotId) && x.AreaCode.StartsWith(dto.AreaCode) && x.CreationTime >= dto.StartTime && x.CreationTime < dto.EndTime)
+                .Where(x => x.HotspotId.StartsWith(dto.HotspotId) && x.CreationTime >= dto.StartTime && x.CreationTime < dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.AreaCode),x=> x.AreaCode.StartsWith(dto.AreaCode))
                 .Select(x => new HotspotAndAreaStatisticsDetailDto
                 { 
                      Status = x.Status,
-
+                     SourceChannel = x.SourceChannel,
+                     ActualHandleStepName = x.ActualHandleStepName,
+                     ReTransactNum  = x.ReTransactNum,
+                     EmergencyLevel  =x .EmergencyLevel,
+                    //OrderScreenStatus  x.OrderScreens.Any()
+                     No = x.No,
+                     CreationTime = x.CreationTime,
+                     Title = x.Title,
+                     ExpiredTime = x.ExpiredTime,
+                     ActualHandleOrgName = x.ActualHandleOrgName,
+                     FiledTime = x.FiledTime,
+                     ActualHandleStepAcceptTime = x.ActualHandleStepAcceptTime,
+                     AcceptType = x.AcceptType,
+                     HotspotName = x.HotspotName,
+                     AcceptorName = x.AcceptorName
                 }) ;
 
 

src/Hotline.Share/Requests/PagedKeywordRequest.cs

@@ -423,7 +423,7 @@ public class AcceptTypeStatisticsReq
 
 public record HotspotAndAreaStatisticsDetailReq:PagedRequest
 {
-    public string AreaCode { get; set; }
+    public string? AreaCode { get; set; }
 
     public string HotspotId { get; set; }
 
@@ -455,7 +455,7 @@ public class HotspotAndAreaStatisticsDetailDto
     /// <summary>
     /// 重办次数
     /// </summary>
-    public int ReTransactNum { get; set; }
+    public int? ReTransactNum { get; set; }
 
     /// <summary>
     /// 紧急程度