From 7075ec039dceedbee2e39699359de5ee26076448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Wed, 30 Jul 2025 15:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=A8=A1=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Learn.Archives.Core/Model/ExamUserInfo.cs     |  5 +--
 Learn.Archives.Core/Model/SchoolBusiness.cs   | 36 ++++++++++---------
 .../Model/SchoolBusinessUser.cs               |  1 -
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/Learn.Archives.Core/Model/ExamUserInfo.cs b/Learn.Archives.Core/Model/ExamUserInfo.cs
index c9d3583..fbe220b 100644
--- a/Learn.Archives.Core/Model/ExamUserInfo.cs
+++ b/Learn.Archives.Core/Model/ExamUserInfo.cs
@@ -55,9 +55,10 @@ namespace Learn.Archives.Core.Model
 
         /// <summary>
         /// 学科成绩
-        /// <para>json字符串 <see cref=" Dictionary(SubjectEnum,decimal)"/></para>
+        /// <para>数据库JSON字段!!!</para>
         /// </summary>
-        public string SubjectDic { get; set; }
+        [SugarColumn(IsJson = true, ColumnDataType = "varchar(800)")]
+        public Dictionary<SubjectEnum, decimal>? SubjectDic { get; set; }
 
 
         /// <summary>
diff --git a/Learn.Archives.Core/Model/SchoolBusiness.cs b/Learn.Archives.Core/Model/SchoolBusiness.cs
index 7181b0d..9cc1e5c 100644
--- a/Learn.Archives.Core/Model/SchoolBusiness.cs
+++ b/Learn.Archives.Core/Model/SchoolBusiness.cs
@@ -1,4 +1,5 @@
-using Learn.Archives.Core.Model.Interface;
+using Learn.Archives.Core.Model.Dto;
+using Learn.Archives.Core.Model.Interface;
 using SqlSugar;
 using System.ComponentModel.DataAnnotations;
 using System.Net;
@@ -35,16 +36,6 @@ namespace Learn.Archives.Core.Model
         /// </summary>
         [SugarColumn(IsNullable = true)]
         public string? Remark { get; set; }
-
-        /// <summary>
-        /// 反馈问题数量
-        /// </summary>
-        public long FeedbackCount{ get; set; }
-        /// <summary>
-        /// 反馈问题已解决数量
-        /// </summary>
-        public long SolveFeedbackCount { get; set; }
-
         /// <summary>
         /// 赴校问题已解决
         /// </summary>
@@ -52,16 +43,16 @@ namespace Learn.Archives.Core.Model
 
         /// <summary>
         /// 反馈问题
-        /// <para>序列化类型<see cref="Dto.FeedbackQuestionsDto[]"/></para>
+        /// <para>数据库JSON字段!!!</para>
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "text")]
-        public string? FeedbackQuestions { get; set; }
+        [SugarColumn(IsNullable = true, IsJson = true,ColumnDataType ="text")]
+        public FeedbackQuestionsDto[]? FeedbackQuestions { get; set; }
         /// <summary>
         /// 解决方案的记录
-        /// <para>序列化类型<see cref="Dto.SolutionRecordDto"/></para>
+        /// <para>数据库JSON字段!!!</para>
         /// </summary>
-        [SugarColumn(IsNullable = true, ColumnDataType = "text")]
-        public string? SolutionRecord { get; set; }
+        [SugarColumn(IsNullable = true, IsJson = true, ColumnDataType = "text")]
+        public SolutionRecordDto? SolutionRecord { get; set; }
 
 
         /// <summary>
@@ -74,6 +65,17 @@ namespace Learn.Archives.Core.Model
         /// </summary>
         [SugarColumn(IsNullable = true, Length = 1000)]
         public string? ClassMeeting { get; set; }
+
+        /// <summary>
+        /// 反馈问题数量
+        /// </summary>
+        public long FeedbackCount => FeedbackQuestions?.Count() ?? 0;
+        /// <summary>
+        /// 反馈问题已解决数量
+        /// </summary>
+        public long SolveFeedbackCount => FeedbackQuestions?
+            .Count(s => s.EndTime != null) ?? 0;
+
         /// <summary>
         /// 开展过座谈
         /// </summary>
diff --git a/Learn.Archives.Core/Model/SchoolBusinessUser.cs b/Learn.Archives.Core/Model/SchoolBusinessUser.cs
index 18bd432..e3c512d 100644
--- a/Learn.Archives.Core/Model/SchoolBusinessUser.cs
+++ b/Learn.Archives.Core/Model/SchoolBusinessUser.cs
@@ -32,6 +32,5 @@ namespace Learn.Archives.Core.Model
         /// </summary>
         public DateTime CreateTime { get; set; } = DateTime.Now;
 
-        //todo 与产品确认赴校信息的流程来设计表
     }
 }