This commit is contained in:
he
2022-12-01 13:48:09 +08:00
parent 45cf5f1242
commit 264db455ff
3 changed files with 55 additions and 3 deletions
@@ -298,7 +298,7 @@ namespace IRaCIS.Core.Application.Service
}).ToListAsync();
var globalTaskAnswer = await (from global in _readingGlobalTaskInfoRepository.Where(x => taskIds.Contains(x.GlobalTaskId) && x.GlobalAnswerType == GlobalAnswerType.Question && x.TrialReadingQuestion.IsJudgeQuestion).Include(x=>x.TrialReadingQuestion)
join taskAnswer in _readingTaskQuestionAnswerRepository.AsQueryable() on new { TaskId= global.TaskId, QuestionId=global.QuestionId??default(Guid) } equals new { TaskId=taskAnswer.VisitTaskId, QuestionId=taskAnswer.ReadingQuestionTrialId }
join taskAnswer in _readingTaskQuestionAnswerRepository.Where(x=>taskIds.Contains(x.VisitTaskId)) on new { TaskId= global.TaskId, QuestionId=global.QuestionId??default(Guid) } equals new { TaskId=taskAnswer.VisitTaskId, QuestionId=taskAnswer.ReadingQuestionTrialId }
select new JudgeQuestionAnswerInfo()
{
Answer = global.Answer.Trim().IsNullOrEmpty()? taskAnswer.Answer: global.Answer,