diff --git a/Src/Dlhis.Canteen/Order/Request/OrderBookingPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderBookingPageRequest.cs
index 02fa01dc..863686a1 100644
--- a/Src/Dlhis.Canteen/Order/Request/OrderBookingPageRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/OrderBookingPageRequest.cs
@@ -16,8 +16,8 @@ public class OrderBookingPageRequest : PageDto
///
/// 支付方式
///
- [EnumDataType(typeof(CanteenBusinessPlaceSourceEnumType))]
- public CanteenBusinessPlaceSourceEnumType? Source { get; set; }
+ [EnumDataType(typeof(BalanceRecordSourceEnumType))]
+ public BalanceRecordSourceEnumType? Source { get; set; }
///
/// 订餐日期区间
diff --git a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
index 8da8950f..5b6a6a33 100644
--- a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
@@ -34,6 +34,11 @@ public class OrderBookingResponse
/// 用户
///
public string UserName { get; set; }
+
+ ///
+ /// 部门名称
+ ///
+ public string DepartmentName { get; set; }
///
/// 餐次
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs
index 20605286..76891522 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs
@@ -176,6 +176,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
var page = await DbContext.Queryable()
.LeftJoin((x, ga) => x.UserNo == ga.No)
+ .LeftJoin((x, ga, dept) => dept.No == ga.DepartmentNo)
.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))
@@ -187,7 +188,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
.Any()
)
.WhereIF(request.ShiftTpe.HasValue, x => x.ShiftType == request.ShiftTpe)
- .Select((x, ga) => new OrderBookingResponse
+ .Select((x, ga, dept) => new OrderBookingResponse
{
No = x.No,
DeliveryAddress = x.DeliveryAddress,
@@ -199,6 +200,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
UserCode = x.UserCode,
UserName = ga.Name,
Source = x.Source,
+ DepartmentName = dept.Name
})
.ToPageListAsync(request);