From d35eda9895168d5f5d76739728da20d0ebebc875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Tue, 26 Aug 2025 19:38:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=96=E8=BE=91=E6=97=B6=E8=87=AA=E5=B8=A6?= =?UTF-8?q?=E7=9A=84=E5=87=BA=E5=85=A5=E7=8F=AD=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learn.Archives.API/Controllers/StudentController.cs | 4 ++-- Learn.Archives.Core/Model/Student.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Learn.Archives.API/Controllers/StudentController.cs b/Learn.Archives.API/Controllers/StudentController.cs index 1435f77..c3f6dad 100644 --- a/Learn.Archives.API/Controllers/StudentController.cs +++ b/Learn.Archives.API/Controllers/StudentController.cs @@ -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?.ToString("yyyy-MM-dd")??string.Empty; - item.JoinTime = ex.JoinTime?.ToString("yyyy-MM-dd") ?? string.Empty; + 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.AmountRelief = ex.AmountRelief; item.ReliefApplication = ex.ReliefApplication; diff --git a/Learn.Archives.Core/Model/Student.cs b/Learn.Archives.Core/Model/Student.cs index 08ba783..67900ac 100644 --- a/Learn.Archives.Core/Model/Student.cs +++ b/Learn.Archives.Core/Model/Student.cs @@ -64,13 +64,13 @@ namespace Learn.Archives.Core.Model /// 退出时间 /// [SugarColumn(IsNullable = true)] - public DateTime? ExitTime { get; set; } = DateTime.Now; + public DateTime? ExitTime { get; set; } /// /// 退出时间 /// [SugarColumn(IsNullable = true)] - public DateTime? JoinTime { get; set; } = DateTime.Now; + public DateTime? JoinTime { get; set; } /// /// 创建时间 -- 2.40.1 From 070057ba96df4fd64d9d6c273146f868653fd1b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com> Date: Tue, 26 Aug 2025 19:58:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=9C=80=E9=AB=98?= =?UTF-8?q?=E5=88=86=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learn.Archives.API/Controllers/ExamClassInfoController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Learn.Archives.API/Controllers/ExamClassInfoController.cs b/Learn.Archives.API/Controllers/ExamClassInfoController.cs index 4d1136d..b74a5d7 100644 --- a/Learn.Archives.API/Controllers/ExamClassInfoController.cs +++ b/Learn.Archives.API/Controllers/ExamClassInfoController.cs @@ -220,6 +220,7 @@ 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, @@ -236,7 +237,7 @@ namespace Learn.Archives.API.Controllers //最大小分 if (v < eCInfo.MinScore) eCInfo.MinScore = v; - else if (v > eCInfo.MaxScore) + if (v > eCInfo.MaxScore) eCInfo.MaxScore = v; avgTotal += v;//追加得分 } -- 2.40.1