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

dev #9

Merged
hy merged 11 commits from dev into master 2025-08-26 20:11:08 +08:00
Conversation 0 Commits 11 Files Changed 16 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d35eda9895 - Show all commits

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>
/// 创建时间 /// 创建时间