diff --git a/Learn.Archives.API/Controllers/ExamClassInfoController.cs b/Learn.Archives.API/Controllers/ExamClassInfoController.cs index 50fbcca..7de18c1 100644 --- a/Learn.Archives.API/Controllers/ExamClassInfoController.cs +++ b/Learn.Archives.API/Controllers/ExamClassInfoController.cs @@ -113,7 +113,7 @@ namespace Learn.Archives.API.Controllers u.Id, }).ToDictionaryAsync(s => s.Name, s => s.Id); //处理学生成绩数据 - var userList = dataList.Select(s => + var userList = schoolArr.Select(s => { var classInfo = classArr .FirstOrDefault(x => x.Name == s.Class ); @@ -242,6 +242,10 @@ namespace Learn.Archives.API.Controllers CSharpTypeName="int" }); } + else + { + Oh.ModelError($"传入了无法识别的 年级 => {c.FieldValue}"); + } } return base.PageList(model); } diff --git a/Learn.Archives.API/Controllers/ExamController.cs b/Learn.Archives.API/Controllers/ExamController.cs index e28a7d7..b2b5caf 100644 --- a/Learn.Archives.API/Controllers/ExamController.cs +++ b/Learn.Archives.API/Controllers/ExamController.cs @@ -56,6 +56,10 @@ namespace Learn.Archives.API.Controllers CSharpTypeName = "int" }); } + else + { + Oh.ModelError($"传入了无法识别的 年级 => {c.FieldValue}"); + } } return base.PageList(model); diff --git a/Learn.Archives.API/Controllers/ExamUserInfoController.cs b/Learn.Archives.API/Controllers/ExamUserInfoController.cs index ca1d860..57bde89 100644 --- a/Learn.Archives.API/Controllers/ExamUserInfoController.cs +++ b/Learn.Archives.API/Controllers/ExamUserInfoController.cs @@ -47,6 +47,10 @@ namespace Learn.Archives.API.Controllers CSharpTypeName = "int" }); } + else + { + Oh.ModelError($"传入了无法识别的 年级 => {c.FieldValue}"); + } } var oldSer = model.OrderBy.ToEnum(); if (oldSer != null) diff --git a/Learn.Archives.API/Controllers/StudentController.cs b/Learn.Archives.API/Controllers/StudentController.cs index 5b05073..0823dd8 100644 --- a/Learn.Archives.API/Controllers/StudentController.cs +++ b/Learn.Archives.API/Controllers/StudentController.cs @@ -106,6 +106,7 @@ namespace Learn.Archives.API.Controllers if (e == null || e.UserCenterId == 0) Oh.ModelError("无效数据"); var has = await baseService.AsQueryable().FirstAsync(s => s.UserCenterId == e.UserCenterId); + e.Status = e.Status ?? UserStatusEnum.未录入; if (has == null) await baseService.InsertAsync(e); else @@ -196,7 +197,7 @@ namespace Learn.Archives.API.Controllers //基础信息校验 if (string.IsNullOrEmpty(s.UserType) || string.IsNullOrEmpty(s.School)|| - string.IsNullOrEmpty(s.Class) || + (s.UserType != "年级主任" && string.IsNullOrEmpty(s.Class)) || string.IsNullOrEmpty(s.Phone)|| string.IsNullOrEmpty(s.RealName) ) @@ -274,6 +275,12 @@ namespace Learn.Archives.API.Controllers foreach (var s in dataList) { var ginfo = GradeHelper.GetStudentGradeBaseByGrade(s.Grade); + if(ginfo is null) + { + s.ErrorMsg = "未能识别的[初一/初2028] [年级范围应当是当前有效的就读年级]"; + impError.Add(s); + continue; + } var gStr = GradeHelper.GetGrade(ginfo.GradeLevel, ginfo.GradeYear); if (gStr.ToEnum() == null) //无效的传入年级 { diff --git a/Learn.Archives.Core/Model/Student.cs b/Learn.Archives.Core/Model/Student.cs index 533c1ed..a38227a 100644 --- a/Learn.Archives.Core/Model/Student.cs +++ b/Learn.Archives.Core/Model/Student.cs @@ -51,6 +51,7 @@ namespace Learn.Archives.Core.Model /// /// 学生状态 /// + [SugarColumn(IsNullable = true)] public UserStatusEnum? Status { get; set; } ///