This commit is contained in:
he
2023-03-22 10:27:41 +08:00
parent 31a902605d
commit 0b1d2b0da9
5 changed files with 95 additions and 7 deletions
@@ -633,7 +633,21 @@ namespace IRaCIS.Application.Services
if (visitTaskId != null)
{
answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId).ToListAsync(); ;
answers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId).ToListAsync();
var taskinfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
questions.ForEach(x =>
{
x.CrterionDictionaryGroup = taskinfo.CrterionDictionaryGroup;
});
}
else
{
var crterionDictionaryGroup= new List<CrterionDictionaryGroup>() { CrterionDictionaryGroup.General, CrterionDictionaryGroup.BeforeConvert };
questions.ForEach(x =>
{
x.CrterionDictionaryGroup = crterionDictionaryGroup;
});
}
@@ -823,9 +837,27 @@ namespace IRaCIS.Application.Services
}).OrderBy(x => x.ShowOrder).ToListAsync();
//是否是预览
if (inDto.IsGetPreview == false)
if (inDto.TaskId != null)
{
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.TaskId).FirstNotNullAsync();
qusetionList.ForEach(x =>
{
x.CrterionDictionaryGroup = taskInfo.CrterionDictionaryGroup;
});
}
else
{
qusetionList.ForEach(x =>
{
x.CrterionDictionaryGroup = new List<CrterionDictionaryGroup>() { CrterionDictionaryGroup.General, CrterionDictionaryGroup.BeforeConvert };
});
}
//是否是预览
if (inDto.IsGetPreview == false)
{
// 是否获取所有问题
if (inDto.IsGetallQuestion)