diff --git a/Learn.Archives.API/Controllers/ExamClassInfoController.cs b/Learn.Archives.API/Controllers/ExamClassInfoController.cs index e3f022b..b93c4e9 100644 --- a/Learn.Archives.API/Controllers/ExamClassInfoController.cs +++ b/Learn.Archives.API/Controllers/ExamClassInfoController.cs @@ -100,7 +100,7 @@ namespace Learn.Archives.API.Controllers !p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState) .Select((s, c, p, pr, u) => new { - Name = c.Name + u.RealName, + Name =p.GradeLevel+p.GraduationYear.ToString()+ c.Name + u.RealName, u.Id, }).ToDictionaryAsync(s => s.Name, s => s.Id); //处理学生成绩数据 @@ -115,6 +115,12 @@ namespace Learn.Archives.API.Controllers return null; } var grade = GradeHelper.GetStudentGradeBaseByGrade(s.Grade); + if (grade is null) + { + s.Error = "未能识别有效的年级!"; + errorExcelInfo.Add(s); + return null; + } var sub = ImportExamInfoSubjectDic(s); if(sub is null) { @@ -122,7 +128,7 @@ namespace Learn.Archives.API.Controllers errorExcelInfo.Add(s); return null; } - var name = s.Class + s.Student; + var name = grade.GradeLevel+ grade.GradeYear+ s.Class + s.Student; if (!userDic.ContainsKey(name)) { s.Error = "未能匹配到年级班级下对应的学生"; diff --git a/Learn.Archives.API/appsettings.Production.json b/Learn.Archives.API/appsettings.Production.json index 2f0a12c..4e4fca1 100644 --- a/Learn.Archives.API/appsettings.Production.json +++ b/Learn.Archives.API/appsettings.Production.json @@ -8,12 +8,12 @@ "AppConfig": { "ID": 2, //程序唯一值 "Redis": { - "ConnectionString": "r-2vc07uq6kgm580hxeu.redis.cn-chengdu.rds.aliyuncs.com:6379,password=r-2vc07uq6kgm580hxeu:JyFQa8MeZ4ndxVbdhUc6,defaultDatabase=3" + + "ConnectionString": "archives-redis-in.23544.com:6379,password=MY50BKM1i3z8Vcz6V7c2,defaultDatabase=61" }, "DB": { - "ConnectionString": "AllowLoadLocalInfile=true;Server=rm-2vc20nd3d11g0oh6g2o.rwlb.cn-chengdu.rds.aliyuncs.com;User ID=marking;Password=poiuytPOIUYT098765)(*&^%;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", - //"ConnectionString": "AllowLoadLocalInfile=true;Server=usercenter-mysql.23544.com;User ID=usercenter;Password=MPsSSNuvFO7wBqADXC9zweh9tdOPNwm6;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", - + //"ConnectionString": "AllowLoadLocalInfile=true;Server=rm-2vc20nd3d11g0oh6g2o.rwlb.cn-chengdu.rds.aliyuncs.com;User ID=marking;Password=poiuytPOIUYT098765)(*&^%;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", + "ConnectionString": "AllowLoadLocalInfile=true;Server=archives-mysql-in.23544.com;User ID=archives;Password=MPsSSNuvFO7wBqADXC9zweh9tdOPNwm6;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None", "SqlType": "MySql", "UpdateTable": false