|
|
|
@ -323,13 +323,13 @@ namespace Myshipping.Application
|
|
|
|
|
|
|
|
|
|
var list = entities.Adapt<SqlSugarPagedList<PageBookingOrder>>();
|
|
|
|
|
|
|
|
|
|
var status = _repBookingStatus.AsQueryable();
|
|
|
|
|
var remark = _bookingremark.AsQueryable();
|
|
|
|
|
var status =await _repBookingStatus.AsQueryable().ToListAsync();
|
|
|
|
|
var remark =await _bookingremark.AsQueryable().ToListAsync();
|
|
|
|
|
foreach (var item in list.Items)
|
|
|
|
|
{
|
|
|
|
|
var sta = await status.Where(x => x.BookingId == item.Id).ToListAsync();
|
|
|
|
|
var sta = status.Where(x => x.BookingId == item.Id).ToList();
|
|
|
|
|
if (sta != null) { item.bookstatus = sta; }
|
|
|
|
|
var st = await remark.Where(x => x.PId == item.Id).ToListAsync();
|
|
|
|
|
var st = remark.Where(x => x.PId == item.Id).ToList();
|
|
|
|
|
if (st != null) { item.bookremark = st; }
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(item.ETD))
|
|
|
|
|
{
|
|
|
|
|