From 93c38be18ac885abb579ba030b154ca276180961 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Thu, 21 Mar 2024 18:40:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Request/OrderBookingPageRequest.cs | 10 ++++++++-- .../Order/Services/Implements/BookingOrderService.cs | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Request/OrderBookingPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderBookingPageRequest.cs index 3dd0fc6d..24cab90b 100644 --- a/Src/Dlhis.Canteen/Order/Request/OrderBookingPageRequest.cs +++ b/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 { - + /// + /// 订单状态 CanteenOrderStatusEnumType + /// + [EnumDataType(typeof(CanteenOrderStatusEnumType))] + public CanteenOrderStatusEnumType? OrderStatus { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs index 92e36ffd..c8187ecc 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs @@ -179,6 +179,8 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService var page = await DbContext.Queryable() .LeftJoin((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,