dev #34

Merged
hy merged 2 commits from dev into staging 2025-11-13 16:57:06 +08:00
4 changed files with 20 additions and 2 deletions
Showing only changes of commit b0d9ed1d6f - Show all commits

View File

@ -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);
}

View File

@ -56,6 +56,10 @@ namespace Learn.Archives.API.Controllers
CSharpTypeName = "int"
});
}
else
{
Oh.ModelError($"传入了无法识别的 年级 => {c.FieldValue}");
}
}
return base.PageList(model);

View File

@ -47,6 +47,10 @@ namespace Learn.Archives.API.Controllers
CSharpTypeName = "int"
});
}
else
{
Oh.ModelError($"传入了无法识别的 年级 => {c.FieldValue}");
}
}
var oldSer = model.OrderBy.ToEnum<SubjectEnum>();
if (oldSer != null)

View File

@ -197,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)
)
@ -275,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<GradeEnum>() == null) //无效的传入年级
{