diff --git a/Learn.Archives.API/Controllers/ExamUserInfoController.cs b/Learn.Archives.API/Controllers/ExamUserInfoController.cs index 8b0754e..c7a5903 100644 --- a/Learn.Archives.API/Controllers/ExamUserInfoController.cs +++ b/Learn.Archives.API/Controllers/ExamUserInfoController.cs @@ -6,9 +6,11 @@ using Learn.Archives.Core.Model.Dto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using System.Diagnostics; +using System.Linq; using System.Security.Claims; using UserCenter.Model; using UserCenter.Model.Common; +using UserCenter.Model.Enum; namespace Learn.Archives.API.Controllers { @@ -24,7 +26,7 @@ namespace Learn.Archives.API.Controllers this.baseService = baseService; this.userInfo = userInfo; } - public override Task PageList([FromBody] QueryRequestBase model) + public override async Task PageList([FromBody] QueryRequestBase model) { var c = model.Conditions.FirstOrDefault(s => s.FieldName == "Grade"); if (c != null) @@ -46,7 +48,17 @@ namespace Learn.Archives.API.Controllers }); } } - return base.PageList(model); + var oldSer = model.OrderBy.ToEnum(); + if (oldSer != null) + { + model.OrderBy = "id"; + var res = (PageResult)await base.PageList(model); + if (model.OrderByType == SqlSugar.OrderByType.Asc) + res.Data = res.Data.OrderBy(s => s.SubjectDic?[oldSer.Value]).ToList(); + else + res.Data = res.Data.OrderByDescending(s => s.SubjectDic?[oldSer.Value]).ToList(); + } + return await base.PageList(model); } } } diff --git a/Learn.Archives.API/appsettings.json b/Learn.Archives.API/appsettings.json index d3d0c1e..76c592f 100644 --- a/Learn.Archives.API/appsettings.json +++ b/Learn.Archives.API/appsettings.json @@ -14,7 +14,7 @@ "DB": { "ConnectionString": "AllowLoadLocalInfile=true;Server=58.17.132.2;User ID=marking;Password=qwe123!@#;Port=3306;Database=learn.archives;CharSet=utf8mb4;Port=43306;pooling=true;SslMode=None;", "SqlType": "MySql", - "UpdateTable": false + "UpdateTable": true }, "AuthKey": { "Secret": "9FAB7AC7-F1DB-4C56-B84F-044055A34AF2", diff --git a/Learn.Archives.Core/Model/Dto/SchoolBusinessDto.cs b/Learn.Archives.Core/Model/Dto/SchoolBusinessDto.cs index 374f7fc..62306d0 100644 --- a/Learn.Archives.Core/Model/Dto/SchoolBusinessDto.cs +++ b/Learn.Archives.Core/Model/Dto/SchoolBusinessDto.cs @@ -51,7 +51,7 @@ namespace Learn.Archives.Core.Model.Dto /// public DateTime? ExecutionTime { get; set; } /// - /// 操作人 [后台自动赋值提交人名称] + /// 操作人 /// public string? Operator { get; set; } public string? ExecutionTimeStr => ExecutionTime?.ToString("yyyy-MM-dd"); @@ -86,6 +86,10 @@ namespace Learn.Archives.Core.Model.Dto /// 解决时间 /// public DateTime? EndTime { get; set; } + /// + /// 反馈问题的执行记录 + /// + public RecordDto[]? RecordArr { get; set; } public string? EndTimeStr=> EndTime?.ToString("yyyy-MM-dd"); diff --git a/Learn.Archives.Core/Model/SchoolBusiness.cs b/Learn.Archives.Core/Model/SchoolBusiness.cs index a181514..2542666 100644 --- a/Learn.Archives.Core/Model/SchoolBusiness.cs +++ b/Learn.Archives.Core/Model/SchoolBusiness.cs @@ -89,6 +89,12 @@ namespace Learn.Archives.Core.Model [SugarColumn(IsNullable = true, Length = 1000)] public string? ClassMeeting { get; set; } + /// + /// 预计解决时间 + /// + [SugarColumn(IsNullable = true)] + public DateTime? EndTime { get; set; } + /// /// 反馈问题数量 ///