Преглед изворни кода

fixed: 历史工单加入关键词过滤

xf пре 1 година
родитељ
комит
5bf3d86fd6

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

@@ -1763,6 +1763,7 @@ public class OrderController : BaseController
         var (total, items) = await _orderRepository.Queryable()
             .Where(d => d.FromPhone == dto.PhoneNo)
             .WhereIF(!string.IsNullOrEmpty(dto.OrderId), d => d.Id != dto.OrderId)
+            .WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
             .OrderByDescending(d => d.CreationTime)
             .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
         return new PagedDto<OrderDto>(total, _mapper.Map<IReadOnlyList<OrderDto>>(items));

+ 1 - 1
src/Hotline.Share/Dtos/Order/QueryOrderHistoryDto.cs

@@ -7,7 +7,7 @@ using Hotline.Share.Requests;
 
 namespace Hotline.Share.Dtos.Order
 {
-    public record QueryOrderHistoryDto : PagedRequest
+    public record QueryOrderHistoryDto : PagedKeywordRequest
     {
         public string PhoneNo { get; set; }
         public string? OrderId { get; set; }