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

Compare commits

base: marking:613e5edb3212e18e4fbaf2883edd1b931fadc41b
Branches Tags
marking:master
marking:dev
marking:staging
..
compare: marking:8a9838c5414fc3f07277fb380eee10cd640f1226
Branches Tags
marking:master
marking:dev
marking:staging

No commits in common. "613e5edb3212e18e4fbaf2883edd1b931fadc41b" and "8a9838c5414fc3f07277fb380eee10cd640f1226" have entirely different histories.
613e5edb32 ... 8a9838c541

1 changed files with 3 additions and 10 deletions
Show Stats Expand all files Collapse all files

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

@ -116,12 +116,6 @@ 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))
{ {
@ -311,12 +305,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
return null; res.Add(item.Key, 0m);
} }
return res; return res;
} }
@ -356,9 +350,8 @@ 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 &&