小程序检录按照秩序册导入顺序排序
This commit is contained in:
parent
2e00719d56
commit
b475fd6b08
@ -173,17 +173,13 @@ public class CheckinScheduleService : ITransient
|
|||||||
var sessionOrderMap = sessions.ToDictionary(
|
var sessionOrderMap = sessions.ToDictionary(
|
||||||
x => x.Id,
|
x => x.Id,
|
||||||
x => GetImportedSessionOrder(x.SessionName, GetSessionOrder(x.SessionNo)));
|
x => GetImportedSessionOrder(x.SessionName, GetSessionOrder(x.SessionNo)));
|
||||||
var orderedSessions = sessions
|
|
||||||
.OrderBy(x => sessionOrderMap[x.Id])
|
|
||||||
.ThenBy(x => venueMap.GetValueOrDefault(x.VenueId)?.Sort ?? int.MaxValue)
|
|
||||||
.ThenBy(x => x.SessionNo)
|
|
||||||
.ToList();
|
|
||||||
var sessionMap = sessions.ToDictionary(x => x.Id);
|
var sessionMap = sessions.ToDictionary(x => x.Id);
|
||||||
|
|
||||||
|
// 秩序册允许不同比赛日重复从“第1场”开始,不能再按场次数字排序。
|
||||||
|
// 导入时出场记录 ID 按 Excel 行顺序生成,因此按 ID 即为原始导入顺序。
|
||||||
var units = entries
|
var units = entries
|
||||||
.Where(x => sessionMap.ContainsKey(x.SessionId))
|
.Where(x => sessionMap.ContainsKey(x.SessionId))
|
||||||
.OrderBy(x => sessionOrderMap[x.SessionId])
|
.OrderBy(x => x.Id)
|
||||||
.ThenBy(x => x.PlayOrder)
|
|
||||||
.Select((entry, index) =>
|
.Select((entry, index) =>
|
||||||
{
|
{
|
||||||
var session = sessionMap[entry.SessionId];
|
var session = sessionMap[entry.SessionId];
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user