|
@@ -11100,7 +11100,7 @@ ORDER by gctggrc.id DESC
|
|
|
|
|
|
var hrDtas = await _sqlSugar.Queryable<Grp_HotelReservations>()
|
|
|
.Where(it => it.IsDel == 0 && it.DiId == _dto.DiId)
|
|
|
- .OrderBy(x => x.CreateTime)
|
|
|
+ .OrderBy(x => x.CheckInDate)
|
|
|
.ToListAsync();
|
|
|
|
|
|
//判断数据是否完整
|
|
@@ -11127,6 +11127,14 @@ ORDER by gctggrc.id DESC
|
|
|
}
|
|
|
else {
|
|
|
|
|
|
+
|
|
|
+ bool guestIdBool = int.TryParse(item.GuestName,out int guestId);
|
|
|
+ if (guestIdBool)
|
|
|
+ {
|
|
|
+ guestIds.Add(guestId);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
//NaN
|
|
|
if (item.GuestName.Contains("NaN"))
|
|
|
{
|