diff --git a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs index 75e3773..83b87ee 100644 --- a/VOL.Business/Services/HomeWork/S_HomeWorkService.cs +++ b/VOL.Business/Services/HomeWork/S_HomeWorkService.cs @@ -66,32 +66,35 @@ namespace VOL.Business.Services.Norm schoolCode = UserContext.Current.TenantId; } - var query = from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode.Contains(schoolCode)) - select new HomeWorkListModel() - { - WorkId = s.Id, - TeacherId = s.TeacherId, - StudentScope = s.StudentScope, - WorkStatus = - currentTime < s.StartTime - ? HomeWorkStatus.NotStarted - : currentTime > s.EndTime - ? HomeWorkStatus.Ended - : HomeWorkStatus.Afoot, + var query = + from s in _homeWorkRepository.FindAsIQueryable(x => x.SchoolCode.Contains(schoolCode)) + let workStatus = + currentTime < s.StartTime + ? HomeWorkStatus.NotStarted + : currentTime > s.EndTime + ? HomeWorkStatus.Ended + : HomeWorkStatus.Afoot + select new HomeWorkListModel + { + WorkId = s.Id, + TeacherId = s.TeacherId, + StudentScope = s.StudentScope, - TeacherName = s.TeacherName, - WorkName = s.WorkName, - WorkText = s.WorkText, - WorkType = s.WorkType, - WorkModeType = s.WorkModeType, - WorkModeTypeName = s.WorkModeType.GetDescription(), - StartTime = s.StartTime, - EndTime = s.EndTime, - StudentScopeStr = s.StudentScope.GetDescription(), - WorkStatusStr = s.WorkStatus.GetDescription(), - WorkTypeName = s.WorkTypeName, - GradeAndClassName = $"{s.GradeName}-{s.ClassName}" - }; + WorkStatus = workStatus, + WorkStatusStr = workStatus.GetDescription(), + + TeacherName = s.TeacherName, + WorkName = s.WorkName, + WorkText = s.WorkText, + WorkType = s.WorkType, + WorkModeType = s.WorkModeType, + WorkModeTypeName = s.WorkModeType.GetDescription(), + StartTime = s.StartTime, + EndTime = s.EndTime, + StudentScopeStr = s.StudentScope.GetDescription(), + WorkTypeName = s.WorkTypeName, + GradeAndClassName = $"{s.GradeName}-{s.ClassName}" + }; if (paramDto.WorkType > 0) {