|
|
|
@ -185,7 +185,7 @@ namespace Shentun.Peis.QueueRegisters |
|
|
|
WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null), |
|
|
|
ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0, |
|
|
|
RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder |
|
|
|
}).ToList().OrderBy(o => o.ItemTypeDisplayOrder).ThenBy(o => o.RoomDisplayOrder).ToList(); |
|
|
|
}).ToList().OrderBy(o => o.RoomDisplayOrder).ToList(); |
|
|
|
|
|
|
|
return entListDto; |
|
|
|
} |
|
|
|
@ -209,7 +209,7 @@ namespace Shentun.Peis.QueueRegisters |
|
|
|
WaitCount = roomGroup.Count(c => c.queueRegisterEmpty != null), |
|
|
|
ItemTypeDisplayOrder = roomGroup.FirstOrDefault().itemTypeEmpty != null ? roomGroup.FirstOrDefault().itemTypeEmpty.DisplayOrder : 0, |
|
|
|
RoomDisplayOrder = roomGroup.FirstOrDefault().room.DisplayOrder |
|
|
|
}).ToList().OrderBy(o => o.ItemTypeDisplayOrder).ThenBy(o => o.RoomDisplayOrder).ToList(); |
|
|
|
}).ToList().OrderBy(o => o.RoomDisplayOrder).ToList(); |
|
|
|
|
|
|
|
return entListDto; |
|
|
|
} |
|
|
|
|