fix 增加显示菜品名称

This commit is contained in:
2024-03-26 11:27:27 +08:00
parent f69106c59b
commit d71f080cd3
2 changed files with 11 additions and 3 deletions

View File

@@ -34,7 +34,7 @@ public class OrderBookingResponse
/// 用户
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 部门名称
/// </summary>
@@ -76,4 +76,6 @@ public class OrderBookingResponse
/// 汇总数量
/// </summary>
public int TotalNumber { get; set; }
public object DishesInfos { get; set; }
}

View File

@@ -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<CanteenOrderDetailEntity>()
.LeftJoin<DishesEntity>((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;