|
|
@ -292,7 +292,16 @@ namespace Myshipping.Application
|
|
|
|
.Where(u => userlist.Contains((long)u.CreatedUserId))
|
|
|
|
.Where(u => userlist.Contains((long)u.CreatedUserId))
|
|
|
|
.OrderBy(PageInputOrder.OrderBuilder(input.SortField,input.descSort))
|
|
|
|
.OrderBy(PageInputOrder.OrderBuilder(input.SortField,input.descSort))
|
|
|
|
.ToPagedListAsync(input.PageNo, input.PageSize);
|
|
|
|
.ToPagedListAsync(input.PageNo, input.PageSize);
|
|
|
|
return entities.XnPagedResult();
|
|
|
|
var list = entities.Adapt<SqlSugarPagedList<PageBookingOrder>>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var item in list.Items)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
var sta = await _repBookingStatus.AsQueryable().Where(x => x.BookingId == item.Id).ToListAsync();
|
|
|
|
|
|
|
|
if (sta != null) { item.bookstatus = sta; }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|