Merge branch 'feature/exam' into test

合并冲突

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

@@ -319,7 +319,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
             {
                 await UpdateExamAsync(_userExamItemRepository, addUserExamItemDto, cancellationToken);
             }
-
+            
             await CalcuteExamItemScore(_userExamItemRepository, addUserExamItemDto, cancellationToken);
 
             return startExamViewResponse;
@@ -413,7 +413,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
             }
 
             startExamViewResponse.TimeSpan = examManage?.TimeSpan ?? 0;
-            startExamViewResponse.StartTime = examManage?.StartTime;
+            startExamViewResponse.StartTime = examUserExam?.StartTime;
             return startExamViewResponse;
         }
 
@@ -718,7 +718,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
         public async Task<GradingResultPageViewResponse> GetGradingResultPagedList(GradingPagedRequest gradingPagedRequest)
         {
             // 只要有阅卷记录就在已阅卷列表中，已阅卷和未阅卷会有重复数据，只有所有记录都已阅卷才会从未阅卷列表中排除
-            var userExamTable = _repository.Queryable().WhereIF(gradingPagedRequest.IsCheck != null, x => x.IsCheck == gradingPagedRequest.IsCheck && x.IsSubmit);
+            var userExamTable = _repository.Queryable().WhereIF(gradingPagedRequest.IsCheck != null, x => x.IsCheck == gradingPagedRequest.IsCheck).Where(x=>x.IsSubmit);
 
             var examManageTable = new ExamRepository<ExamManage>(_uow, _dataPermissionFilterBuilder, _serviceProvider).Queryable();