marking
/
Learn.Archives
19
0
Fork 0
Code Pull Requests Actions Releases Activity

Merge pull request 'dev' (#32) from dev into staging 

Reviewed-on: #32
This commit is contained in:
hy 2025-11-12 17:54:46 +08:00
parent 4e6f8c9c84 688183e2d1
commit 8003d82687
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Learn.Archives.API/Controllers/ExamClassInfoController.cs
View File

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

2
Learn.Archives.API/Controllers/StudentController.cs
View File

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

2
Learn.Archives.Core/Model/Student.cs
View File

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