Compare commits
No commits in common. "a25722b88bab5746c5dae0ffd1a5125f56479f5b" and "8003d8268791189c7ccc6449976bd223aefc7670" have entirely different histories.
a25722b88b
...
8003d82687
|
|
@ -113,7 +113,7 @@ namespace Learn.Archives.API.Controllers
|
|||
u.Id,
|
||||
}).ToDictionaryAsync(s => s.Name, s => s.Id);
|
||||
//处理学生成绩数据
|
||||
var userList = schoolArr.Select(s =>
|
||||
var userList = dataList.Select(s =>
|
||||
{
|
||||
var classInfo = classArr
|
||||
.FirstOrDefault(x => x.Name == s.Class );
|
||||
|
|
@ -242,10 +242,6 @@ namespace Learn.Archives.API.Controllers
|
|||
CSharpTypeName="int"
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
Oh.ModelError($"传入了无法识别的 年级 => {c.FieldValue}");
|
||||
}
|
||||
}
|
||||
return base.PageList(model);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,10 +56,6 @@ namespace Learn.Archives.API.Controllers
|
|||
CSharpTypeName = "int"
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
Oh.ModelError($"传入了无法识别的 年级 => {c.FieldValue}");
|
||||
}
|
||||
}
|
||||
|
||||
return base.PageList(model);
|
||||
|
|
|
|||
|
|
@ -47,10 +47,6 @@ namespace Learn.Archives.API.Controllers
|
|||
CSharpTypeName = "int"
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
Oh.ModelError($"传入了无法识别的 年级 => {c.FieldValue}");
|
||||
}
|
||||
}
|
||||
var oldSer = model.OrderBy.ToEnum<SubjectEnum>();
|
||||
if (oldSer != null)
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ namespace Learn.Archives.API.Controllers
|
|||
if (e == null || e.UserCenterId == 0)
|
||||
Oh.ModelError("无效数据");
|
||||
var has = await baseService.AsQueryable().FirstAsync(s => s.UserCenterId == e.UserCenterId);
|
||||
e.Status = e.Status ?? UserStatusEnum.未录入;
|
||||
if (has == null)
|
||||
await baseService.InsertAsync(e);
|
||||
else
|
||||
|
|
@ -197,7 +196,7 @@ namespace Learn.Archives.API.Controllers
|
|||
//基础信息校验
|
||||
if (string.IsNullOrEmpty(s.UserType) ||
|
||||
string.IsNullOrEmpty(s.School)||
|
||||
(s.UserType != "年级主任" && string.IsNullOrEmpty(s.Class)) ||
|
||||
string.IsNullOrEmpty(s.Class) ||
|
||||
string.IsNullOrEmpty(s.Phone)||
|
||||
string.IsNullOrEmpty(s.RealName)
|
||||
)
|
||||
|
|
@ -275,12 +274,6 @@ 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) //无效的传入年级
|
||||
{
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@ namespace Learn.Archives.Core.Model
|
|||
/// <summary>
|
||||
/// 学生状态
|
||||
/// </summary>
|
||||
[SugarColumn(IsNullable = true)]
|
||||
public UserStatusEnum? Status { get; set; }
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Reference in New Issue