调整导入接口

src/Hotline.Application/Exam/QueryExtensions/ExamManages/OfflineExamQueryExtensions.cs

@@ -20,7 +20,9 @@ namespace Hotline.Application.Exam.QueryExtensions.ExamManages
             expression = ExpressionableUtility.CreateExpression<ExamOfflineExamAnalysis>()
             .AndIF(offlineExamAnalysisPagedRequest.StartTime.IsNotNull(), x => x.StartTime >= offlineExamAnalysisPagedRequest.StartTime)
             .AndIF(offlineExamAnalysisPagedRequest.EndTime.IsNotNull(), x => x.StartTime <= offlineExamAnalysisPagedRequest.EndTime)
-            .AndIF(offlineExamAnalysisPagedRequest.Keyword.IsNotNull(), x => x.ExamName.Contains(offlineExamAnalysisPagedRequest.Keyword))
+            .AndIF(offlineExamAnalysisPagedRequest.Keyword.IsNotEmpty(), x => x.ExamName.Contains(offlineExamAnalysisPagedRequest.Keyword))
+            .AndIF(offlineExamAnalysisPagedRequest.MinScore.IsNotNull(), x => x.Score > offlineExamAnalysisPagedRequest.MinScore)
+            .AndIF(offlineExamAnalysisPagedRequest.MaxScore.IsNotNull(), x => x.Score < offlineExamAnalysisPagedRequest.MaxScore)
             .ToExpression();
 
             return expression;

src/Hotline.Share/Requests/Exam/OfflineExamAnalysisPagedRequest.cs

@@ -1,6 +1,20 @@
-namespace Hotline.Share.Requests.Exam
+using System.ComponentModel;
+
+namespace Hotline.Share.Requests.Exam
 {
     public record OfflineExamAnalysisPagedRequest : AnalysisReportRequest
     {
+        /// <summary>
+        /// 最小分数
+        /// </summary>
+        [Description("最小分数")]
+        public int? MinScore { get; set; }
+
+        /// <summary>
+        /// 最大分数
+        /// </summary>
+
+        [Description("最大分数")]
+        public int? MaxScore { get; set; }
     }
 }

src/Hotline/Exams/ExamManages/OfflineExamAnalysisExcel.cs

@@ -29,6 +29,18 @@ namespace Hotline.Exams.ExamManages
         [ExcelColumnName("考试标题")]
         public string ExamName { get; set; }
 
+        /// <summary>
+        /// 考试开始时间
+        /// </summary>
+        [ExcelColumnName("考试开始时间")]
+        public DateTime StartTime { get; set; }
+
+        /// <summary>
+        /// 考试结束时间
+        /// </summary>
+        [ExcelColumnName("考试结束时间")]
+        public DateTime? EndTime { get; set; }
+
         /// <summary>
         /// 考试总分
         /// </summary>
@@ -46,17 +58,5 @@ namespace Hotline.Exams.ExamManages
         /// </summary>
         [ExcelColumnName("考试分数")]
         public int Score { get; set; }
-
-        /// <summary>
-        /// 考试开始时间
-        /// </summary>
-        [ExcelColumnName("考试开始时间")]
-        public DateTime StartTime { get; set; }
-
-        /// <summary>
-        /// 考试结束时间
-        /// </summary>
-        [ExcelColumnName("考试结束时间")]
-        public DateTime? EndTime { get; set; }
     }
 }