From 909542992c04157fb2b1f45016a8fd219f6c3c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Wed, 12 Nov 2025 17:34:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=97=B6=E6=9C=AA=E5=BD=95?=
=?UTF-8?q?=E5=85=A5=E5=AD=A6=E7=94=9F=E5=85=A5=E5=AD=A6=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=AF=B7=E6=B1=82400=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Learn.Archives.Core/Model/Student.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Learn.Archives.Core/Model/Student.cs b/Learn.Archives.Core/Model/Student.cs
index 67900ac..533c1ed 100644
--- a/Learn.Archives.Core/Model/Student.cs
+++ b/Learn.Archives.Core/Model/Student.cs
@@ -51,7 +51,7 @@ namespace Learn.Archives.Core.Model
///
/// 学生状态
///
- public UserStatusEnum Status { get; set; }
+ public UserStatusEnum? Status { get; set; }
///
/// 备注
From 688183e2d1df98028ae8ab3c6d13fd874df115b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Wed, 12 Nov 2025 17:49:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=80=83=E8=AF=95?=
=?UTF-8?q?=E6=88=90=E7=BB=A9=E5=88=86=E6=9E=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/ExamClassInfoController.cs | 14 +++++++++-----
.../Controllers/StudentController.cs | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Learn.Archives.API/Controllers/ExamClassInfoController.cs b/Learn.Archives.API/Controllers/ExamClassInfoController.cs
index d9d6c60..50fbcca 100644
--- a/Learn.Archives.API/Controllers/ExamClassInfoController.cs
+++ b/Learn.Archives.API/Controllers/ExamClassInfoController.cs
@@ -343,13 +343,17 @@ namespace Learn.Archives.API.Controllers
{
var school = await sService.GetFirstAsync(s => s.Id == schoolArr.Key);
- var classArr = await db.Queryable().Where(c => c.SchoolId == school.Id &&
- c.GradeLevel == exam.GradeLevel &&
- c.GraduationYear == exam.GradeYear && !c.DeleteState).ToArrayAsync();
+ var classArr = await db.Queryable()
+ .Where(c => c.SchoolId == school.Id &&
+ 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()
{
ExamId = exam.Id,
diff --git a/Learn.Archives.API/Controllers/StudentController.cs b/Learn.Archives.API/Controllers/StudentController.cs
index ed55d2f..5b05073 100644
--- a/Learn.Archives.API/Controllers/StudentController.cs
+++ b/Learn.Archives.API/Controllers/StudentController.cs
@@ -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;
+ item.Status = ex.Status??UserStatusEnum.未录入;
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");