fix 订单查询

Src/Dlhis.Canteen/Order/Request/OrderBookingPageRequest.cs

@@ -1,8 +1,14 @@
-using Kurisu.Core.DataAccess.Dto;
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.Core.DataAccess.Dto;
 
 namespace Dlhis.Canteen.Order.Request;
 
 public class OrderBookingPageRequest : PageDto
 {
-
+    /// <summary>
+    /// 订单状态 CanteenOrderStatusEnumType
+    /// </summary>
+    [EnumDataType(typeof(CanteenOrderStatusEnumType))]
+    public CanteenOrderStatusEnumType? OrderStatus { get; set; }
 }

Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs

@@ -179,6 +179,8 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
         var page = await DbContext.Queryable<CanteenOrderEntity>()
            .LeftJoin<GainfoEntity>((x, ga) => x.UserNo == ga.No)
            .Where(x => myCodes.Contains(x.BusinessPlaceCode))
+           .WhereIF(request.OrderStatus.HasValue, x => x.OrderStatus == request.OrderStatus)
+           .WhereIF(request.Search.IsPresent(), (x, ga) => x.UserCode == request.Search || ga.Name.Contains(request.Search))
            .Select((x, ga) => new OrderBookingResponse
            {
                No = x.No,