Merge branch 'feature/exam' into dev

合并冲突

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

@@ -1402,7 +1402,8 @@ namespace Hotline.Application.Exam.Service.ExamManages
                 Id = qs.Id,
                 Name = s.Name,
                 QuestionId = qsb.ExamQuestionId,
-                SourcewareId = s.Id
+                SourcewareId = s.Id,
+                AttachmentId = s.AttachmentId
             }).MergeTable().Where(x => questionIds.Contains(x.QuestionId));
 
             return await querable.ToListAsync();
@@ -1470,7 +1471,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
             var userExamTable = _repository.Queryable().Where(x => x.Id == id);
             var userExamItemTable = _userExamItemRepository.Queryable();
             var examManageTable = _examManageRepository.Queryable();
-            var questionTable = new ExamRepository<ExamQuestionBak>(_uow, _dataPermissionFilterBuilder, _serviceProvider).Queryable();
+            var questionTable = new ExamRepository<ExamQuestionBak>(_uow, _dataPermissionFilterBuilder, _serviceProvider).Queryable().WhereIF(!string.IsNullOrEmpty(questionId), x => x.QuestionId == questionId);
             var questionScoreTable = new ExamRepository<ExamQuestionScoreBak>(_uow, _dataPermissionFilterBuilder, _serviceProvider).Queryable();
 
 
@@ -1486,7 +1487,7 @@ namespace Hotline.Application.Exam.Service.ExamManages
                                 Title = q.Title,
                                 QuestionType = q.QuestionType,
                                 QuestionId = q.Id,
-                            }).MergeTable().OrderBy(x=>x.QuestionType).OrderBy(x=>x.Id).WhereIF(!string.IsNullOrEmpty(questionId),x=>x.QuestionId == questionId);
+                            }).MergeTable().OrderBy(x=>x.QuestionType).OrderBy(x=>x.Id);
 
             return await querable.Distinct().ToListAsync();
         }

src/Hotline.Share/Dtos/Questions/QuestionSourcewareDto.cs

@@ -12,7 +12,7 @@ namespace Hotline.Share.Dtos.Questions
     [Description("关联课件")]
     public class QuestionSourcewareDto:UpdateQuestionSourcewareDto
     {
-
+        public string AttachmentId { get; set; }
     }
 
     /// <summary>