裁判表单问题加属性
continuous-integration/drone/push Build is running
Details
continuous-integration/drone/push Build is running
Details
parent
7b1449189e
commit
960d1f4116
|
|
@ -2452,9 +2452,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
{
|
{
|
||||||
public Guid ReadingQuestionId { get; set; }
|
public Guid ReadingQuestionId { get; set; }
|
||||||
public string QuestionName { get; set; } = string.Empty;
|
public string QuestionName { get; set; } = string.Empty;
|
||||||
|
public string Type { get; set; } = string.Empty;
|
||||||
|
public string TypeValue { get; set; } = string.Empty;
|
||||||
public int ShowOrder { get; set; }
|
public int ShowOrder { get; set; }
|
||||||
public string R1Answer { get; set; } = string.Empty;
|
public string R1Answer { get; set; } = string.Empty;
|
||||||
public string R2Answer { get; set; } = string.Empty;
|
public string R2Answer { get; set; } = string.Empty;
|
||||||
|
public TableQuestionType? QuestionGenre { get; set; }
|
||||||
|
public string DictionaryCode { get; set; } = string.Empty;
|
||||||
|
public ValueUnit? Unit { get; set; }
|
||||||
|
public string? CustomUnit { get; set; }
|
||||||
|
public ValueOfType? ValueType { get; set; }
|
||||||
|
public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GetJudgeFormInDto
|
public class GetJudgeFormInDto
|
||||||
|
|
@ -2476,6 +2484,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public string TypeValue { get; set; } = string.Empty;
|
public string TypeValue { get; set; } = string.Empty;
|
||||||
public int ShowOrder { get; set; }
|
public int ShowOrder { get; set; }
|
||||||
public string Answer { get; set; } = string.Empty;
|
public string Answer { get; set; } = string.Empty;
|
||||||
|
public TableQuestionType? QuestionGenre { get; set; }
|
||||||
|
public string DictionaryCode { get; set; } = string.Empty;
|
||||||
|
public ValueUnit? Unit { get; set; }
|
||||||
|
public string? CustomUnit { get; set; }
|
||||||
|
public ValueOfType? ValueType { get; set; }
|
||||||
|
public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SetJudgeFormInDto
|
public class SetJudgeFormInDto
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,14 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
ReadingQuestionId = x.Id,
|
ReadingQuestionId = x.Id,
|
||||||
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
|
QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
|
||||||
|
Type = x.Type,
|
||||||
|
TypeValue = x.TypeValue,
|
||||||
ShowOrder = x.ShowOrder,
|
ShowOrder = x.ShowOrder,
|
||||||
|
QuestionGenre = x.QuestionGenre,
|
||||||
|
DictionaryCode = x.DictionaryCode,
|
||||||
|
Unit = x.Unit,
|
||||||
|
CustomUnit = x.CustomUnit,
|
||||||
|
ValueType = x.ValueType,
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
|
@ -174,6 +181,11 @@ namespace IRaCIS.Core.Application.Service
|
||||||
TypeValue = x.TypeValue,
|
TypeValue = x.TypeValue,
|
||||||
ShowOrder = x.ShowOrder,
|
ShowOrder = x.ShowOrder,
|
||||||
Answer = answers.FirstOrDefault(answer => answer.ReadingQuestionTrialId == x.Id)?.Answer ?? string.Empty,
|
Answer = answers.FirstOrDefault(answer => answer.ReadingQuestionTrialId == x.Id)?.Answer ?? string.Empty,
|
||||||
|
QuestionGenre = x.QuestionGenre,
|
||||||
|
DictionaryCode = x.DictionaryCode,
|
||||||
|
Unit = x.Unit,
|
||||||
|
CustomUnit = x.CustomUnit,
|
||||||
|
ValueType = x.ValueType,
|
||||||
}).ToList(),
|
}).ToList(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue