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

staging #49

Merged
hy merged 5 commits from staging into master 2025-12-04 18:37:26 +08:00
Conversation 0 Commits 5 Files Changed 4 +10 -3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 613e5edb32 - Show all commits

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

@ -116,6 +116,12 @@ namespace Learn.Archives.API.Controllers
} }
var grade = GradeHelper.GetStudentGradeBaseByGrade(s.Grade); var grade = GradeHelper.GetStudentGradeBaseByGrade(s.Grade);
var sub = ImportExamInfoSubjectDic(s); var sub = ImportExamInfoSubjectDic(s);
if(sub is null)
{
s.Error = "遇到了无法处理成绩值! 请检查本行的成绩";
errorExcelInfo.Add(s);
return null;
}
var name = s.Class + s.Student; var name = s.Class + s.Student;
if (!userDic.ContainsKey(name)) if (!userDic.ContainsKey(name))
{ {
@ -305,12 +311,12 @@ namespace Learn.Archives.API.Controllers
var res = new Dictionary<SubjectEnum, decimal>(); var res = new Dictionary<SubjectEnum, decimal>();
foreach (var item in c) foreach (var item in c)
{ {
if(string.IsNullOrWhiteSpace(item.Value)) if (string.IsNullOrWhiteSpace(item.Value))
res.Add(item.Key, 0m); res.Add(item.Key, 0m);
else if (decimal.TryParse(item.Value.Trim(), out decimal r)) else if (decimal.TryParse(item.Value.Trim(), out decimal r))
res.Add(item.Key, r); res.Add(item.Key, r);
else else
res.Add(item.Key, 0m); return null;
} }
return res; return res;
} }
@ -350,8 +356,9 @@ namespace Learn.Archives.API.Controllers
var db = sService.Context; var db = sService.Context;
foreach (var schoolArr in userInfoArr.GroupBy(s => s.SchoolId)) foreach (var schoolArr in userInfoArr.GroupBy(s => s.SchoolId))
{ {
var school = await sService.GetFirstAsync(s => s.Id == schoolArr.Key); var school = await sService.GetFirstAsync(s => s.Id == schoolArr.Key);
if(school is null)
continue;
var classArr = await db.Queryable<Classes>() var classArr = await db.Queryable<Classes>()
.Where(c => c.SchoolId == school.Id && .Where(c => c.SchoolId == school.Id &&
c.GradeLevel == exam.GradeLevel && c.GradeLevel == exam.GradeLevel &&