This commit is contained in:
he
2023-01-03 10:38:01 +08:00
parent f96ce12758
commit 55d2ec2dd7
7 changed files with 106 additions and 1 deletions
@@ -364,6 +364,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public QuestionMark? QuestionMark { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
public List<string> ParentTriggerValueList { get; set; }
public List<string> RelevanceValueList { get; set; }
@@ -432,6 +439,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public QuestionMark? QuestionMark { get; set; }
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
}
@@ -877,7 +891,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 数据来源
/// </summary>
public DataSources? DataSource { get; set; } = DataSources.ManualEntry;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 问题英文分组
/// </summary>
public string GroupEnName { get; set; } = string.Empty;
public List<string> ParentTriggerValueList { get; set; }
public List<string> RelevanceValueList { get; set; }
public List<CalculateInfo> CalculateQuestionList { get; set; }
@@ -1043,6 +1067,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 序号标记
/// </summary>
public string OrderMark { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 问题英文分组
/// </summary>
public string GroupEnName { get; set; } = string.Empty;
}
public class GetQuestionCalculateRelationInDto
@@ -1464,6 +1498,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 序号标记
/// </summary>
public string OrderMark { get; set; } = string.Empty;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 问题英文分组
/// </summary>
public string GroupEnName { get; set; } = string.Empty;
}
@@ -1652,6 +1696,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public LimitEdit LimitEdit { get; set; } = LimitEdit.None;
/// <summary>
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty;
/// <summary>
/// 问题英文分组
/// </summary>
public string GroupEnName { get; set; } = string.Empty;
public List<string> ParentTriggerValueList { get; set; }
public List<string> RelevanceValueList { get; set; }
@@ -113,6 +113,13 @@ namespace IRaCIS.Application.Services
), true);
}
public async Task<Object> Test()
{
return await _readingQuestionTrialRepository.Select(x => x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)).FirstAsync();
}
/// <summary>
/// 获取问题
/// </summary>
@@ -140,6 +147,8 @@ namespace IRaCIS.Application.Services
x.ReadingQuestionId,
x.QuestionName
}).ToListAsync();
result.ForEach(x =>
{
x.TableQuestions = tablequestion.Where(y => x.QuestionId == y.ReadingQuestionId).Select(y => new CalculateQuestion()