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

staging #20

Merged
hy merged 24 commits from staging into master 2025-10-14 11:13:23 +08:00
Conversation 0 Commits 24 Files Changed 23 +6 -5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ae5d2a8293 - Show all commits

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

@ -220,6 +220,7 @@ namespace Learn.Archives.API.Controllers
GradeYear = classInfo.GraduationYear, GradeYear = classInfo.GraduationYear,
PeopleCount = classUserArr.Count(), PeopleCount = classUserArr.Count(),
MinScore = int.MaxValue, MinScore = int.MaxValue,
MaxScore = -99,
BaseSchoolScore = exam.BaseSchoolScore, BaseSchoolScore = exam.BaseSchoolScore,
TestPaperType = exam.TestPaperType, TestPaperType = exam.TestPaperType,
Type = exam.Type, Type = exam.Type,
@ -236,7 +237,7 @@ namespace Learn.Archives.API.Controllers
//最大小分 //最大小分
if (v < eCInfo.MinScore) if (v < eCInfo.MinScore)
eCInfo.MinScore = v; eCInfo.MinScore = v;
else if (v > eCInfo.MaxScore) if (v > eCInfo.MaxScore)
eCInfo.MaxScore = v; eCInfo.MaxScore = v;
avgTotal += 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; if (!exDataDic.ContainsKey(item.Id)) continue;
var ex = exDataDic[item.Id].First(); var ex = exDataDic[item.Id].First();
item.Status = ex.Status; item.Status = ex.Status;
item.ExitTime = ex.ExitTime?.ToString("yyyy-MM-dd")??string.Empty; item.ExitTime = ex.ExitTime==null? string.Empty : ex.ExitTime?.ToString("yyyy-MM-dd");
item.JoinTime = ex.JoinTime?.ToString("yyyy-MM-dd") ?? string.Empty; item.JoinTime = ex.JoinTime == null ? string.Empty : ex.JoinTime?.ToString("yyyy-MM-dd");
item.AmountRelief = ex.AmountRelief; item.AmountRelief = ex.AmountRelief;
item.ReliefApplication = ex.ReliefApplication; item.ReliefApplication = ex.ReliefApplication;

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

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