Merge branch 'feature/exam' into dev

合并冲突

src/Hotline.Application/Exam/Service/ExamManages/UserExamService.cs

@@ -374,7 +374,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
 
             }
             // TODO: 删除之前选项和答案
-            else
+            else if(userExam.ExamStatus == EExamStatus.Complete)
             {
                 await ReExam(userExam, cancellationToken);
             }
@@ -404,7 +404,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
             reExamUserExam.IsSuccess = false;
             reExamUserExam.IsReExam = true;
             reExamUserExam.Score = 0;
-            reExamUserExam.ExamStatus = EExamStatus.Executing;
+            reExamUserExam.ExamStatus = EExamStatus.NoStart;
 
             reExamUserExam.ToInsert(_sessionContext);
 

src/Hotline.Application/Exam/Service/Trains/TrainRecordService.cs

@@ -274,7 +274,7 @@ namespace Hotline.Application.Exam.Service.Trains
                     SortIndex = r.SortIndex,
                     Status = r.Status,
                     TrainTime = p.TrainEndTime
-                });
+                }).MergeTable();
 
             var calcuteRateResult = new TrainResultRateViewResponse
             {