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

Compare commits

base: marking:ae5d2a829320db08d7a8c62c69346d87e987848a
Branches Tags
marking:master
marking:dev
marking:staging
..
compare: marking:119576da72407bb1e4756ed9c700dc617a41ec9a
Branches Tags
marking:master
marking:dev
marking:staging

No commits in common. "ae5d2a829320db08d7a8c62c69346d87e987848a" and "119576da72407bb1e4756ed9c700dc617a41ec9a" have entirely different histories.
ae5d2a8293 ... 119576da72

3 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

@ -220,7 +220,6 @@ namespace Learn.Archives.API.Controllers
GradeYear = classInfo.GraduationYear,
PeopleCount = classUserArr.Count(),
MinScore = int.MaxValue,
MaxScore = -99,
BaseSchoolScore = exam.BaseSchoolScore,
TestPaperType = exam.TestPaperType,
Type = exam.Type,
@ -237,7 +236,7 @@ namespace Learn.Archives.API.Controllers
//最大小分
if (v < eCInfo.MinScore)
eCInfo.MinScore = v;
if (v > eCInfo.MaxScore)
else if (v > eCInfo.MaxScore)
eCInfo.MaxScore = v;
avgTotal += v;//追加得分
}

4
Learn.Archives.API/Controllers/StudentController.cs
View File

@ -98,8 +98,8 @@ namespace Learn.Archives.API.Controllers
if (!exDataDic.ContainsKey(item.Id)) continue;
var ex = exDataDic[item.Id].First();
item.Status = ex.Status;
item.ExitTime = ex.ExitTime==null? string.Empty : ex.ExitTime?.ToString("yyyy-MM-dd");
item.JoinTime = ex.JoinTime == null ? string.Empty : ex.JoinTime?.ToString("yyyy-MM-dd");
item.ExitTime = ex.ExitTime?.ToString("yyyy-MM-dd")??string.Empty;
item.JoinTime = ex.JoinTime?.ToString("yyyy-MM-dd") ?? string.Empty;
item.AmountRelief = ex.AmountRelief;
item.ReliefApplication = ex.ReliefApplication;

4
Learn.Archives.Core/Model/Student.cs
View File

@ -64,13 +64,13 @@ namespace Learn.Archives.Core.Model
/// 退出时间
/// </summary>
[SugarColumn(IsNullable = true)]
public DateTime? ExitTime { get; set; }
public DateTime? ExitTime { get; set; } = DateTime.Now;
/// <summary>
/// 退出时间
/// </summary>
[SugarColumn(IsNullable = true)]
public DateTime? JoinTime { get; set; }
public DateTime? JoinTime { get; set; } = DateTime.Now;
/// <summary>
/// 创建时间