Merge branch 'test_feature_task363' into dev

src/Hotline.Api/Controllers/EarlyController.cs

@@ -236,7 +236,7 @@ namespace Hotline.Api.Controllers
             return new
             {
                 OrderStatus = EnumExts.GetDescriptions<EOrderStatus>(),
-                OrderPushStatus = EnumExts.GetDescriptions<EOrderPushStatus>()
+                OrderPushStatus = EnumExts.GetDescriptions<EOrderPushStatus>().Where(d => new int[] { 2 }.Contains(d.Key) == false).ToList()
             };
         }
 
@@ -253,6 +253,10 @@ namespace Hotline.Api.Controllers
                 .Includes(x=>x.Order)
                 .Where(x => x.OrderPushStatus != EOrderPushStatus.FiledPush)
                 .Where(x=> dto.ChooseOrderId.Contains(x.OrderId) == false)
+                .WhereIF(string.IsNullOrEmpty(dto.No)==false,x=>x.Order.No.Contains(dto.No))
+                .WhereIF(string.IsNullOrEmpty(dto.Title)==false,x=>x.Order.Title.Contains(dto.Title))
+                .WhereIF(dto.OrderStatus.HasValue,x=>x.Order.Status == dto.OrderStatus)
+                .WhereIF(dto.OrderPushStatus.HasValue,x=>x.OrderPushStatus == dto.OrderPushStatus)
                 .ToPagedListAsync(dto.PageIndex,dto.PageSize,HttpContext.RequestAborted);
 
             return new PagedDto<CanChooseOrderRsp>(total, _mapper.Map<IReadOnlyList<CanChooseOrderRsp>>(items));

src/Hotline.Share/Dtos/Early/EarlyDto.cs

@@ -350,7 +350,7 @@ namespace Hotline.Share.Dtos.Early
 
     public record EarlyWarningPushDetailDto
     {
-        public string EarlyWarningPushId { get; set; }
+        public string? EarlyWarningPushId { get; set; }
 
         public string OrderId { get; set; }
 
@@ -402,6 +402,11 @@ namespace Hotline.Share.Dtos.Early
         /// </summary>
         public string? No { get; set; }
 
+        /// <summary>
+        /// 工单状态
+        /// </summary>
+        public EOrderStatus? OrderStatus { get; set; }
+
         /// <summary>
         /// 推送状态
         /// </summary>
@@ -415,6 +420,8 @@ namespace Hotline.Share.Dtos.Early
         public OrderDto Order { get; set; }
 
         public EOrderPushStatus OrderPushStatus { get; set; }
+
+        public string? OrderPushStatusText => OrderPushStatus.GetDescription();
     }
 
     public record AddEarlyPushRequest