Uat_Study
he 2022-11-01 11:11:14 +08:00
parent 611f914d0f
commit 57bb9e5bba
3 changed files with 9 additions and 1 deletions

View File

@ -1705,6 +1705,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsPage { get; set; } = false;
public string DefaultValue { get; set; } = string.Empty;
/// <summary>
/// 标准分页Id
/// </summary>

View File

@ -412,7 +412,7 @@ namespace IRaCIS.Application.Services
qusetionList.ForEach(x =>
{
x.Answer = answers.Where(y => y.ReadingQuestionTrialId == x.Id).Select(x => x.Answer).FirstOrDefault() ?? string.Empty;
x.Answer = answers.Where(y => y.ReadingQuestionTrialId == x.Id).Select(x => x.Answer).FirstOrDefault() ?? x.DefaultValue;
});
#endregion

View File

@ -164,10 +164,16 @@ namespace IRaCIS.Application.Services
PageName = leftpage.PageName,
PageShowOrder = leftpage.ShowOrder,
IsPublicPage = leftpage.IsPublicPage,
DefaultValue = data.DefaultValue,
};
var qusetionList = await query.Where(x => x.ShowQuestion != ShowQuestion.Hide).OrderBy(x => x.ShowOrder).ToListAsync();
qusetionList.ForEach(x =>
{
x.Answer = x.Answer.IsNullOrEmpty() ? x.DefaultValue : x.Answer;
});
return qusetionList;
}