3
1

2 کامیت‌ها eeca2185bf ... 60623557ff

نویسنده SHA1 پیام تاریخ
  guqiang 60623557ff Merge branch 'feature/exam' into test 16 ساعت پیش
  guqiang b104902c1a 调整培训接口 16 ساعت پیش
1فایلهای تغییر یافته به همراه9 افزوده شده و 9 حذف شده
  1. 9 9
      src/Hotline.Application/Exam/Service/Trains/TrainRecordService.cs

+ 9 - 9
src/Hotline.Application/Exam/Service/Trains/TrainRecordService.cs

@@ -327,17 +327,17 @@ namespace Hotline.Application.Exam.Service.Trains
         private async Task<List<SimpleKnowladgeDto>> GetKnowladges(EntityQueryRequest entityQueryRequest)
         private async Task<List<SimpleKnowladgeDto>> GetKnowladges(EntityQueryRequest entityQueryRequest)
         {
         {
             var questionTable = QuestionQueryable(entityQueryRequest);
             var questionTable = QuestionQueryable(entityQueryRequest);
-            var questionSourcewareRepository = new ExamRepository<ExamPracticeQuestionSourceware>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
-            var sourcewareRepository = new ExamRepository<KnowledgeBase.Knowledge>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
-            var questionSourcewareTable = questionSourcewareRepository.Queryable();
-            var sourcewareTable = sourcewareRepository.Queryable();
+            var questionKnowladgeRepository = new ExamRepository<ExamTrainPracticeKnowladge>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
+            var knowledgeRepository = new ExamRepository<KnowledgeBase.Knowledge>(_uow, _dataPermissionFilterBuilder, _serviceProvider);
+            var questionKnowladgeTable = questionKnowladgeRepository.Queryable();
+            var knowledgeTable = knowledgeRepository.Queryable();
 
 
-            var queryable = questionTable.InnerJoin(questionSourcewareTable, (r, p, tpt, tp, ExamPracticeQuestionSourceware) => r.Id == ExamPracticeQuestionSourceware.QuestionId)
-                .InnerJoin(sourcewareTable, (r, p, tpt, tp, ExamPracticeQuestionSourceware,sw) => ExamPracticeQuestionSourceware.SourcewareId == sw.Id)
-                .Select((r, p, tpt, tp, ExamPracticeQuestionSourceware, sw) => new SimpleKnowladgeDto
+            var queryable = questionTable.InnerJoin(questionKnowladgeTable, (r, p, tpt, tp, ExamPracticeQuestionKnowledge) => tp.QuestionId == ExamPracticeQuestionKnowledge.QuestionId)
+                .InnerJoin(knowledgeTable, (r, p, tpt, tp, ExamPracticeQuestionKnowledge,kl) => ExamPracticeQuestionKnowledge.KnowladgeId == kl.Id)
+                .Select((r, p, tpt, tp, ExamPracticeQuestionKnowledge, kl) => new SimpleKnowladgeDto
                 {
                 {
-                    Title = sw.Title,
-                    Id = sw.Id
+                    Title = kl.Title,
+                    Id = kl.Id
                 });
                 });
 
 
             return await queryable.ToListAsync();
             return await queryable.ToListAsync();