田爽 1 سال پیش
والد
کامیت
8746b19225
2فایلهای تغییر یافته به همراه8 افزوده شده و 0 حذف شده
  1. 2 0
      src/Hotline.Api/Controllers/OrderController.cs
  2. 6 0
      src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

+ 2 - 0
src/Hotline.Api/Controllers/OrderController.cs

@@ -2135,6 +2135,8 @@ public class OrderController : BaseController
 		var (total, items) = await _orderSpecialRepository.Queryable()
             .Includes(x=>x.Order)
             .Includes(x=>x.Trace)
+            .WhereIF(!string.IsNullOrEmpty(dto.Keyword),x=>x.Order.No.Contains(dto.Keyword!) || x.Order.Title.Contains(dto.Keyword!))
+            .WhereIF(dto.State.HasValue, x=>x.State == dto.State)
 			.OrderByDescending(x => x.CreationTime)
 			.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 		return new PagedDto<OrderSpecialDto>(total, _mapper.Map<IReadOnlyList<OrderSpecialDto>>(items));

+ 6 - 0
src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

@@ -136,6 +136,7 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public int State { get; set; }
 
+		public string StateText => State == 0 ? "待审核" : State == 1 ? "审核通过" : State == 2 ? "审核不通过" : "-";
 		/// <summary>
 		/// 特提节点
 		/// </summary>
@@ -184,6 +185,11 @@ namespace Hotline.Share.Dtos.Order
 	{
 		public DateTime? CreationTimeStart { get; set; }
 		public DateTime? CreationTimeEnd { get; set; }
+
+		/// <summary>
+		///  审核结果  0  待审核  1 审核通过  2 审核不通过
+		/// </summary>
+		public int? State { get; set; }
 	}
 	public class OrderSpecialHandleTime 
 	{