Merge branch 'feature/exam' into test

合并冲突

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

@@ -352,11 +352,13 @@ namespace Hotline.Application.Exam.Service.Trains
 
             addTrainRecordDto.AddTrainRecordOptionDtos?.ForEach(item =>
             {
+                item.TrainRecordId = addTrainRecordDto.TrainRecordId;
                 trainRecordAnswers.Add(_mapper.Map<ExamTrainRecordAnswer>(item));
             });
 
             if (addTrainRecordDto.AddTrainRecordAnswerDto != null)
             {
+                addTrainRecordDto.AddTrainRecordAnswerDto.TrainRecordId = addTrainRecordDto.TrainRecordId;
                 trainRecordAnswers.Add(_mapper.Map<ExamTrainRecordAnswer>(addTrainRecordDto.AddTrainRecordAnswerDto));
             }
 
@@ -365,29 +367,29 @@ namespace Hotline.Application.Exam.Service.Trains
             await _trainRecordAnswerRepository.ValidateAddAsync(trainRecordAnswers,cancellationToken);
         }
 
-        private async Task<TrainPracticeDto> GetTrainQuestionOptions(AddTrainDto addTrainDto)
-        {
-            var trainPracticeOptionsRepository = new ExamRepository<ExamTrainPracticeOptions>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
-            var trainPracticeRepository = new ExamRepository<ExamTrainPractice>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
+        //private async Task<TrainPracticeDto> GetTrainQuestionOptions(AddTrainDto addTrainDto)
+        //{
+        //    var trainPracticeOptionsRepository = new ExamRepository<ExamTrainPracticeOptions>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
+        //    var trainPracticeRepository = new ExamRepository<ExamTrainPractice>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
 
-            // TODO: 获取未答题的第一道题
-            var trainPractice = await trainPracticeRepository.Queryable()
-                .Where(x => x.TrainTemplateId == addTrainDto.TrainTemplateId && x.Id!= addTrainDto.TrainPracticeId).OrderBy(x=>x.SortIndex).FirstAsync();
+        //    // TODO: 获取未答题的第一道题
+        //    var trainPractice = await trainPracticeRepository.Queryable()
+        //        .Where(x => x.TrainTemplateId == addTrainDto.TrainTemplateId && x.Id!= addTrainDto.TrainPracticeId).OrderBy(x=>x.SortIndex).FirstAsync();
 
-            var trainPracticeOptions = await trainPracticeOptionsRepository.Queryable().Where(x => x.TrainPracticeId == trainPractice.Id).ToListAsync();
+        //    var trainPracticeOptions = await trainPracticeOptionsRepository.Queryable().Where(x => x.TrainPracticeId == trainPractice.Id).ToListAsync();
 
-            var trainPracticeOptionsDtos = new List<SimpleTrainPracticeOptionsDto>();
+        //    var trainPracticeOptionsDtos = new List<SimpleTrainPracticeOptionsDto>();
 
-            trainPracticeOptions.ForEach(x =>
-            {
-                trainPracticeOptionsDtos.Add(_mapper.Map<SimpleTrainPracticeOptionsDto>(x));
-            });
+        //    trainPracticeOptions.ForEach(x =>
+        //    {
+        //        trainPracticeOptionsDtos.Add(_mapper.Map<SimpleTrainPracticeOptionsDto>(x));
+        //    });
 
-            var trainPracticeDto = _mapper.Map<TrainPracticeDto>(trainPractice);
-            trainPracticeDto.TrainPracticeOptionsDtos = trainPracticeOptionsDtos;
+        //    var trainPracticeDto = _mapper.Map<TrainPracticeDto>(trainPractice);
+        //    trainPracticeDto.TrainPracticeOptionsDtos = trainPracticeOptionsDtos;
 
-            return trainPracticeDto;
-        }
+        //    return trainPracticeDto;
+        //}
 
         private SqlSugar.ISugarQueryable<ExamTrainPractice> GetTrainPractices(TrainPracticeRequest trainPracticeRequest)
         {

src/Hotline.Share/Dtos/Trains/TrainPracticeOptionsDto.cs

@@ -68,12 +68,24 @@ namespace Hotline.Share.Dtos.Trains
         [Description("题库Id")]
         public string QuestionId { get; set; }
 
+        /// <summary>
+        /// 题库选项Id
+        /// </summary>
+        [Description("题库选项Id")]
+        public string QuestionOptionId { get; set; }
+
         /// <summary>
         /// 选项
         /// </summary>
         [Description("选项")]
         public string Content { get; set; }
 
+        /// <summary>
+        /// 选项题标
+        /// </summary>
+        [Description("选项题标")]
+        public string Label { get; set; }
+
         /// <summary>
         /// 是否选择
         /// </summary>

src/Hotline.Share/Dtos/Trains/TrainRecordDto.cs

@@ -108,17 +108,17 @@ namespace Hotline.Share.Dtos.Trains
         /// </summary>
         public AddTrainRecordAnswerDto AddTrainRecordAnswerDto { get; set; }
 
-        /// <summary>
-        /// 知识Id
-        /// </summary>
-        [Description("知识Id")]
-        public string KnowladgeId { get; set; }
-
-        /// <summary>
-        /// 培训模版Id
-        /// </summary>
-        [Description("培训模版Id")]
-        public string TrainTemplateId { get; set; }
+        ///// <summary>
+        ///// 知识Id
+        ///// </summary>
+        //[Description("知识Id")]
+        //public string KnowladgeId { get; set; }
+
+        ///// <summary>
+        ///// 培训模版Id
+        ///// </summary>
+        //[Description("培训模版Id")]
+        //public string TrainTemplateId { get; set; }
 
         /// <summary>
         /// 培训记录Id

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

@@ -29,7 +29,6 @@ namespace Hotline.Share.Requests.Question
         /// 知识库Id
         /// </summary>
         [Description("知识库Id")]
-        [JsonIgnore]
         public List<string> KnowladgeIds { get; set; }
     }
 }