在掛單資料頁面,增加判斷掛單是否超時
This commit is contained in:
@@ -20,7 +20,12 @@ public class guadanOrderController : ApiController
|
||||
[Route("api/guadan/list")]
|
||||
public async Task<IHttpActionResult> getGuadanList([FromBody] guadan_order_search_dto search)
|
||||
{
|
||||
|
||||
var lastCheckoutTime = _db.GuadanTimeSetting.FirstOrDefault();
|
||||
string lastCheckoutTimeStr = null;
|
||||
if (lastCheckoutTime != null)
|
||||
{
|
||||
lastCheckoutTimeStr = lastCheckoutTime.LatestCheckOut;
|
||||
}
|
||||
var query = _db.GuaDanOrder
|
||||
.Where(a => a.IsCancel == false)
|
||||
.Where(a => a.IsDeleted == false);
|
||||
@@ -49,7 +54,8 @@ public class guadanOrderController : ApiController
|
||||
}
|
||||
}
|
||||
var total = query.Count();
|
||||
var data = await query
|
||||
var data1 = query.ToList();
|
||||
var data = data1
|
||||
.OrderByDescending(b => b.CreatedAt)
|
||||
.Select(a => new
|
||||
{
|
||||
@@ -60,6 +66,14 @@ public class guadanOrderController : ApiController
|
||||
created_at = a.CreatedAt,
|
||||
updated_at = a.UpdatedAt,
|
||||
notes = a.Notes,
|
||||
is_timeout = !string.IsNullOrEmpty(lastCheckoutTimeStr) &&
|
||||
_db.GuaDanOrderGuest
|
||||
.Where(g => g.GuaDanOrderNo == a.GuaDanOrderNo && !g.IsDeleted && g.StatusCode == GuaDanOrderGuest.STATUS_CHECKED_IN)
|
||||
.ToList()
|
||||
.Any(g =>
|
||||
g.CheckOutAt.HasValue &&
|
||||
DateTime.Parse(g.CheckOutAt.Value.ToString("yyyy-MM-dd") + " " + lastCheckoutTimeStr) < DateTime.Now
|
||||
),
|
||||
activity = _db.activities
|
||||
.Where(act => act.num == a.ActivityNum)
|
||||
.Select(act => new
|
||||
@@ -88,7 +102,7 @@ public class guadanOrderController : ApiController
|
||||
})
|
||||
.Skip((search.page - 1) * search.pageSize)
|
||||
.Take(search.pageSize)
|
||||
.ToListAsync();
|
||||
.ToList();
|
||||
return Ok(new
|
||||
{
|
||||
total,
|
||||
|
||||
Reference in New Issue
Block a user