This commit is contained in:
he
2022-08-03 15:51:39 +08:00
parent 810a601583
commit c19c34b80a
8 changed files with 75 additions and 3 deletions
@@ -667,6 +667,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public Guid? ReadingCriterionPageId { get; set; }
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
public List<GetTrialReadingQuestionOutDto> Childrens { get; set; }
}
@@ -267,6 +267,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 标准分页Id
/// </summary>
public Guid? ReadingCriterionPageId { get; set; }
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
}
public class ReadingQuestionSystemView
@@ -492,6 +503,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 裁判类型
/// </summary>
public JudgeTypeEnum JudgeType { get; set; }
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
}
public class AddOrUpdateReadingQuestionSystemInDto
{
@@ -641,6 +663,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 标准分页Id
/// </summary>
public Guid? ReadingCriterionPageId { get; set; }
/// <summary>
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
}
@@ -730,6 +762,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 是否是系统数据
/// </summary>
@@ -672,6 +672,8 @@ namespace IRaCIS.Application.Services
QuestionName = data.QuestionName,
IsRequired = data.IsRequired,
ShowOrder = data.ShowOrder,
RelevanceId=data.RelevanceId,
RelevanceValue=data.RelevanceValue,
ParentId = data.ParentId,
TypeValue = data.TypeValue,
Answer = leftquestionAnswer.Answer,
@@ -287,6 +287,8 @@ namespace IRaCIS.Application.Services
Id = x.Id,
JudgeType = x.JudgeType,
ReadingCriterionPageId = x.ReadingCriterionPageId,
RelevanceId=x.RelevanceId,
RelevanceValue=x.RelevanceValue,
ParentId = x.ParentId,
ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId,
ReadingQuestionSystemId = x.ReadingQuestionSystemId,
@@ -328,10 +330,13 @@ namespace IRaCIS.Application.Services
ParentTriggerValue=c.system.ParentTriggerValue,
QuestionName=c.system.QuestionName,
ReadingCriterionPageId=c.trial.FirstOrDefault()?.ReadingCriterionPageId,
RelevanceId = c.trial.FirstOrDefault()?.RelevanceId,
RelevanceValue = c.trial.FirstOrDefault()?.RelevanceValue,
ReadingQuestionCriterionTrialId = item.Id,
Remark=c.system.Remark,
TrialId=item.TrialId,
Type=c.system.Type,
TypeValue=c.system.TypeValue,
}).ToList();
var copydata = needAddQuestionList.Clone();