|
@@ -327,17 +327,17 @@ namespace Hotline.Application.Exam.Service.Trains
|
|
|
private async Task<List<SimpleKnowladgeDto>> GetKnowladges(EntityQueryRequest 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();
|