修复 未能查询学校学生名称时未添加年级导致重复问题
This commit is contained in:
parent
f13a20a0eb
commit
f40f094139
|
|
@ -100,7 +100,7 @@ namespace Learn.Archives.API.Controllers
|
||||||
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
|
!p.DeleteState && !c.DeleteState && !u.DeleteState && !s.DeleteState)
|
||||||
.Select((s, c, p, pr, u) => new
|
.Select((s, c, p, pr, u) => new
|
||||||
{
|
{
|
||||||
Name = c.Name + u.RealName,
|
Name =p.GradeLevel+p.GraduationYear.ToString()+ c.Name + u.RealName,
|
||||||
u.Id,
|
u.Id,
|
||||||
}).ToDictionaryAsync(s => s.Name, s => s.Id);
|
}).ToDictionaryAsync(s => s.Name, s => s.Id);
|
||||||
//处理学生成绩数据
|
//处理学生成绩数据
|
||||||
|
|
@ -122,7 +122,7 @@ namespace Learn.Archives.API.Controllers
|
||||||
errorExcelInfo.Add(s);
|
errorExcelInfo.Add(s);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
var name = s.Class + s.Student;
|
var name = grade.GradeLevel+ grade.GradeYear+ s.Class + s.Student;
|
||||||
if (!userDic.ContainsKey(name))
|
if (!userDic.ContainsKey(name))
|
||||||
{
|
{
|
||||||
s.Error = "未能匹配到年级班级下对应的学生";
|
s.Error = "未能匹配到年级班级下对应的学生";
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
"AppConfig": {
|
"AppConfig": {
|
||||||
"ID": 2, //程序唯一值
|
"ID": 2, //程序唯一值
|
||||||
"Redis": {
|
"Redis": {
|
||||||
"ConnectionString": "yxjy-redis-in.23544.com:6379,password=MY50BKM1i3z8Vcz6V7c2,defaultDatabase=60",
|
"ConnectionString": "r-2vc07uq6kgm580hxeu.redis.cn-chengdu.rds.aliyuncs.com:6379,password=r-2vc07uq6kgm580hxeu:JyFQa8MeZ4ndxVbdhUc6,defaultDatabase=3"
|
||||||
},
|
},
|
||||||
"DB": {
|
"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=rm-2vc20nd3d11g0oh6g2o.rwlb.cn-chengdu.rds.aliyuncs.com;User ID=marking;Password=poiuytPOIUYT098765)(*&^%;Port=3306;Database=learn.archives;CharSet=utf8mb4;pooling=true;SslMode=None",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue