diff --git a/YD_Event.Application/Client/EventClientController.Scores.cs b/YD_Event.Application/Client/EventClientController.Scores.cs index 83df612..8fdba41 100644 --- a/YD_Event.Application/Client/EventClientController.Scores.cs +++ b/YD_Event.Application/Client/EventClientController.Scores.cs @@ -11,20 +11,11 @@ public partial class EventClientController [AllowAnonymous] [DisplayName("获取成绩赛事")] public async Task> GetScoreEvents( - [FromServices] ISqlSugarRepository resultRepository, [FromServices] ISqlSugarRepository eventRepository) { - var eventIds = await resultRepository.AsQueryable() - .Where(x => x.Status == AvailabilityStatus.Enable && !x.DeleteMark) - .Select(x => x.EventId) - .Distinct() - .ToListAsync(); - - if (eventIds.Count == 0) return new List(); - var events = await eventRepository.AsQueryable() - .Where(x => eventIds.Contains(x.Id) && x.Status == AvailabilityStatus.Enable && !x.DeleteMark) - // 原型要求成绩查询只显示进行中、已结束状态的赛事。 + .Where(x => x.Status == AvailabilityStatus.Enable && !x.DeleteMark) + // 成绩查询按赛事状态开放,未产生成绩时也应允许选择比赛中、已结束的赛事。 .Where(x => x.EventStatus == EventStatus.Ongoing || x.EventStatus == EventStatus.Ended) .OrderByDescending(x => x.MatchStartTime) .ToListAsync(); diff --git a/YD_Event.Application/Judge/JudgeScoringController.cs b/YD_Event.Application/Judge/JudgeScoringController.cs index 6006acf..f70cfc8 100644 --- a/YD_Event.Application/Judge/JudgeScoringController.cs +++ b/YD_Event.Application/Judge/JudgeScoringController.cs @@ -733,11 +733,12 @@ public class JudgeScoringController : IDynamicApiController { var referee = await EnsureRefereeAsync(); var userId = _authManager.UserId; - var messages = (await _messageRepository.AsQueryable() + var messages = await _messageRepository.AsQueryable() .Where(x => x.RefereeId == referee.Id || x.ReceiverUserId == userId) .WhereIF(onlyUnread == true, x => !x.IsRead) - .ToListAsync()) - .OrderByDescending(x => x.CreatedTime).ToList(); + .ToListAsync(); + + messages = messages.OrderByDescending(x => x.CreatedTime).ToList(); var correctionIds = messages .Where(x => string.Equals(x.RelationType, nameof(EventScoreCorrection), StringComparison.OrdinalIgnoreCase) && x.RelationId.HasValue) @@ -1284,6 +1285,11 @@ public class JudgeScoringController : IDynamicApiController /// private const int TaskStatusVoided = 90; + /// + /// 消息类型:成绩修正提醒 + /// + private const int MessageTypeCorrection = 1; + /// /// 评分任务类型:成绩修正 ///