Переглянути джерело

Merge branch 'feature/exam' into dev
合并冲突

guqiang 9 годин тому
батько
коміт
33a40b2691

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

@@ -31,6 +31,7 @@ using Hotline.Repository.SqlSugar.Exam.Repositories;
 using JiebaNet.Segmenter.Common;
 using Hotline.Repository.SqlSugar.Exam.Service;
 using Hotline.Repository.SqlSugar.Exam.Extensions;
+using DocumentFormat.OpenXml.Office2010.Excel;
 
 namespace Hotline.Application.Exam.Service.Trains
 {
@@ -347,6 +348,10 @@ namespace Hotline.Application.Exam.Service.Trains
 
             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)
+                .GroupBy((r, p, tpt, tp, ExamPracticeQuestionKnowledge, kl) => new {
+                    Title = kl.Title,
+                    Id = kl.Id
+                })
                 .Select((r, p, tpt, tp, ExamPracticeQuestionKnowledge, kl) => new SimpleKnowladgeDto
                 {
                     Title = kl.Title,