From d0638bcfd4058e2cd3db5d33b41812ba9f72bd6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Fri, 5 Sep 2025 18:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E8=B5=B4=E6=A0=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8B=93=E5=B1=95=20=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=89=A7=E8=A1=8C=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ExamUserInfoController.cs        | 16 ++++++++++++++--
 Learn.Archives.API/appsettings.json              |  2 +-
 .../Model/Dto/SchoolBusinessDto.cs               |  6 +++++-
 Learn.Archives.Core/Model/SchoolBusiness.cs      |  6 ++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

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<dynamic> PageList([FromBody] QueryRequestBase model)
+        public override async Task<dynamic> 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<SubjectEnum>();
+            if (oldSer != null) 
+            {
+                model.OrderBy = "id";
+                var res = (PageResult<ExamUserInfo>)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
         /// </summary>
         public DateTime? ExecutionTime { get; set; }
         /// <summary>
-        /// 操作人 [后台自动赋值提交人名称]
+        /// 操作人
         /// </summary>
         public string? Operator { get; set; }
         public string? ExecutionTimeStr => ExecutionTime?.ToString("yyyy-MM-dd");
@@ -86,6 +86,10 @@ namespace Learn.Archives.Core.Model.Dto
         /// 解决时间
         /// </summary>
         public DateTime? EndTime { get; set; }
+        /// <summary>
+        /// 反馈问题的执行记录
+        /// </summary>
+        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; }
 
+        /// <summary>
+        /// 预计解决时间
+        /// </summary>
+        [SugarColumn(IsNullable = true)]
+        public DateTime? EndTime { get; set; }
+
         /// <summary>
         /// 反馈问题数量
         /// </summary>