XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Uat_Study
he 2022-08-25 14:29:46 +08:00
parent 7c08e7606c
commit 01796ad344
3 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
View File

@ -25,49 +25,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string CriterionName { get; set; }
}
public class ReadingTableQuestionTrialView: ReadingTableQuestionSystemView
public class ReadingTableQuestionTrialView:ReadingTableQuestionTrial
{
public int? DependShowOrder { get; set; }
}
public class ReadingTableQuestionSystemView
{
public Guid Id { get; set; }
public Guid ReadingQuestionId { get; set; }
public string Type { get; set; }
public Guid? ParentId { get; set; }
public string ParentTriggerValue { get; set; }
public string QuestionName { get; set; }
public int IsRequired { get; set; }
public int ShowOrder { get; set; }
public string TypeValue { get; set; }
public bool IsEnable { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public string Remark { get; set; }
public Guid? RelevanceId { get; set; }
public string RelevanceValue { get; set; }
public int ShowQuestion { get; set; }
public int? MaxRowCount { get; set; }
public string DataTableName { get; set; }
public string DataTableColumn { get; set; }
public class ReadingTableQuestionSystemView : ReadingTableQuestionSystem
{
public int? DependShowOrder { get; set; }
/// <summary>
/// 表格问题类型
/// </summary>
public TableQuestionType TableQuestionType { get; set; }
/// <summary>
/// 依赖父问题
/// </summary>
public Guid? DependParentId { get; set; }
/// <summary>
/// 问题标识
/// </summary>
public QuestionMark? QuestionMark { get; set; }
}
@ -85,33 +51,73 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
}
public class ReadingTableQuestionTrialAddOrEdit: ReadingTableQuestionSystemAddOrEdit
public class ReadingTableQuestionTrialAddOrEdit
{
public Guid? Id { get; set; }
public Guid ReadingQuestionId { get; set; }
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string ParentTriggerValue { get; set; } = string.Empty;
public string QuestionName { get; set; } = string.Empty;
public int IsRequired { get; set; }
public int ShowOrder { get; set; }
public string TypeValue { get; set; } = string.Empty;
public bool IsEnable { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public string Remark { get; set; }
public Guid? RelevanceId { get; set; }
public string RelevanceValue { get; set; } = string.Empty;
public int ShowQuestion { get; set; }
public int? MaxRowCount { get; set; }
public string DataTableName { get; set; } = string.Empty;
public string DataTableColumn { get; set; } = string.Empty;
}
/// <summary>
/// 表格问题类型
/// </summary>
public TableQuestionType? TableQuestionType { get; set; }
/// <summary>
/// 依赖父问题
/// </summary>
public Guid? DependParentId { get; set; }
/// <summary>
/// 项目标准Id
/// </summary>
public Guid TrialCriterionId { get; set; }
/// <summary>
/// 问题标识
/// </summary>
public QuestionMark? QuestionMark { get; set; }
}
///<summary> ReadingTableQuestionSystemAddOrEdit 列表查询参数模型</summary>
public class ReadingTableQuestionSystemAddOrEdit
{
public Guid? Id { get; set; }
public Guid ReadingQuestionId { get; set; }
public string Type { get; set; }
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string ParentTriggerValue { get; set; }
public string QuestionName { get; set; }
public string ParentTriggerValue { get; set; } = string.Empty;
public string QuestionName { get; set; } = string.Empty;
public int IsRequired { get; set; }
public int ShowOrder { get; set; }
public string TypeValue { get; set; }
public string TypeValue { get; set; } = string.Empty;
public bool IsEnable { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public string Remark { get; set; }
public Guid? RelevanceId { get; set; }
public string RelevanceValue { get; set; }
public string RelevanceValue { get; set; } = string.Empty;
public int ShowQuestion { get; set; }
public int? MaxRowCount { get; set; }
public string DataTableName { get; set; }
public string DataTableColumn { get; set; }
public string DataTableName { get; set; } = string.Empty;
public string DataTableColumn { get; set; } = string.Empty;
/// <summary>
/// 表格问题类型

3
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -59,7 +59,8 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder));
CreateMap<ReadingTableQuestionTrial, ReadingTableQuestionTrialView>();
CreateMap<ReadingTableQuestionTrial, ReadingTableQuestionTrialView>()
.ForMember(d => d.DependShowOrder, u => u.MapFrom(s => s.DependParentQuestion.ShowOrder));
CreateMap<ReadingTableQuestionSystemAddOrEdit, ReadingTableQuestionSystem>();
CreateMap<ReadingTableQuestionTrialAddOrEdit, ReadingTableQuestionTrial>();

4
IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs
View File

@ -136,6 +136,10 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public QuestionMark? QuestionMark { get; set; }
[ForeignKey("DependParentId")]
public ReadingTableQuestionTrial DependParentQuestion { get; set; }
}