Merge branch 'feature/exam' into dev

合并冲突

src/Hotline.Application/Exam/QueryExtensions/Questions/QuestionQueryExtesions.cs

@@ -20,6 +20,7 @@ namespace Hotline.Application.Exam.QueryExtensions.Questions
 
             expression = ExpressionableUtility.CreateExpression<ExamQuestion>().AndIF(questionPagedRequest.DifficultyLevel.IsNotNull(), x => questionPagedRequest.DifficultyLevel == x.DifficultyLevel)
             .AndIF(questionPagedRequest.Title.IsNotNullOrEmpty(), x => x.Title.Contains(questionPagedRequest.Title))
+           .AndIF(questionPagedRequest.QuestionType.IsNotNull(),x=>x.QuestionType == questionPagedRequest.QuestionType)
             .ToExpression();
             return expression;
         }

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

@@ -71,7 +71,7 @@ namespace Hotline.Application.Exam.Service.Trains
             trainRecord= _mapper.Map<CompleteTrainRecordDto,ExamTrainRecord>(completeTrainRecordDto, trainRecord);
             trainRecord.ToUpdate(_sessionContext);
 
-            await _repository.ValidateUpdateAsync(trainRecord, cancellationToken);
+            await _repository.UpdateWithValidateAsync(trainRecord, cancellationToken);
         }
 
         public async Task CompleteTrainKnowladgeAsync(CompleteTrainKnowladgeDto completeTrainPracticeDto, CancellationToken cancellationToken)
@@ -80,7 +80,7 @@ namespace Hotline.Application.Exam.Service.Trains
 
             trainKnowladge.ToUpdate(_sessionContext);
 
-            await _trainKnowladgeRepository.ValidateUpdateAsync(trainKnowladge,cancellationToken);
+            await _trainKnowladgeRepository.UpdateWithValidateAsync(trainKnowladge,cancellationToken);
 
         }
 

src/Hotline.Share/Requests/Question/QuestionPagedRequest.cs

@@ -30,5 +30,11 @@ namespace Hotline.Share.Requests.Question
         /// </summary>
         [Description("知识库Id")]
         public List<string> KnowladgeIds { get; set; }
+
+        /// <summary>
+        /// 题型
+        /// </summary>
+        [Description("题型")]
+        public EQuestionType? QuestionType { get; set; }
     }
 }