diff --git a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs index f93f288c..f6ee796e 100644 --- a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs @@ -34,7 +34,7 @@ public class OrderBookingResponse /// 用户 /// public string UserName { get; set; } - + /// /// 部门名称 /// @@ -76,4 +76,6 @@ public class OrderBookingResponse /// 汇总数量 /// public int TotalNumber { get; set; } + + public object DishesInfos { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs index 7116dee7..9ea6e736 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs @@ -201,20 +201,26 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService UserCode = x.UserCode, UserName = ga.Name, Source = x.Source, - DepartmentName = dept.Name + DepartmentName = dept.Name, }) .ToPageListAsync(request); var nos = page.Data.Select(x => x.No).ToList(); var details = await DbContext.Queryable() + .LeftJoin((x, dishes) => x.DishesCode == dishes.CustomCode) .Where(x => nos.Contains(x.OrderNo)) - .Select(x => new { x.OrderNo, x.BookingDate, x.Number }). + .Select((x, dishes) => new { x.OrderNo, x.BookingDate, x.Number, dishes.Name }). ToListAsync(); page.Data.ForEach(x => { x.BookingDate = details.FirstOrDefault(item => item.OrderNo == x.No).BookingDate; x.TotalNumber = details.Where(item => item.OrderNo == x.No).Sum(item => item.Number); + x.DishesInfos = details.Where(item => item.OrderNo == x.No).Select(item => new + { + item.Name + }) + .ToList(); }); return page;