Compare commits

..

No commits in common. "8003d8268791189c7ccc6449976bd223aefc7670" and "4e6f8c9c847bd9a0066e8a30e0af08a3fc285751" have entirely different histories.

3 changed files with 7 additions and 11 deletions

View File

@ -343,17 +343,13 @@ namespace Learn.Archives.API.Controllers
{
var school = await sService.GetFirstAsync(s => s.Id == schoolArr.Key);
var classArr = await db.Queryable<Classes>()
.Where(c => c.SchoolId == school.Id &&
c.GradeLevel == exam.GradeLevel &&
c.GraduationYear == exam.GradeYear && !c.DeleteState)
.ToArrayAsync();
var classArr = await db.Queryable<Classes>().Where(c => c.SchoolId == school.Id &&
c.GradeLevel == exam.GradeLevel &&
c.GraduationYear == exam.GradeYear && !c.DeleteState).ToArrayAsync();
foreach (var classUserArr in userInfoArr.Where(s=>s.SchoolId == school.Id).GroupBy(s => s.ClassId))
foreach (var classUserArr in userInfoArr.GroupBy(s => s.ClassId))
{
var classInfo = classArr.FirstOrDefault(s => s.Id == classUserArr.Key);
if (classInfo is null)
continue;
var classInfo = classArr.First(s => s.Id == classUserArr.Key);
var eCInfo = new ExamClassInfo()
{
ExamId = exam.Id,

View File

@ -137,7 +137,7 @@ namespace Learn.Archives.API.Controllers
res.Data.Add(item);
if (!exDataDic.ContainsKey(item.Id)) continue;
var ex = exDataDic[item.Id].First();
item.Status = ex.Status??UserStatusEnum.;
item.Status = ex.Status;
item.ExitTime = ex.ExitTime==null? string.Empty : ex.ExitTime?.ToString("yyyy-MM-dd");
item.JoinTime = ex.JoinTime == null ? string.Empty : ex.JoinTime?.ToString("yyyy-MM-dd");

View File

@ -51,7 +51,7 @@ namespace Learn.Archives.Core.Model
/// <summary>
/// 学生状态
/// </summary>
public UserStatusEnum? Status { get; set; }
public UserStatusEnum Status { get; set; }
/// <summary>
/// 备注