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

修改

Uat_Study
he 2022-08-10 10:10:54 +08:00
parent 63c92874c3
commit 84ce2e2032
7 changed files with 111 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -641,7 +641,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
public IsRequired IsRequired { get; set; }
/// <summary>
/// 排序
@ -695,7 +695,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 图片数量
/// </summary>
public int ImageCount { get; set; }
public int ImageCount { get; set; }
/// <summary>
/// 是否显示
/// </summary>
public ShowQuestion ShowQuestion { get; set; }
public List<GetTrialReadingQuestionOutDto> Childrens { get; set; }
}

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

@ -190,8 +190,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string CriterionName { get; set; } = string.Empty;
}
@ -227,11 +225,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
/// <summary>
/// 排序
/// </summary>
@ -285,6 +278,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 图片数量
/// </summary>
public int ImageCount { get; set; } = 0;
/// <summary>
/// 是否是必须
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 是否显示
/// </summary>
public ShowQuestion ShowQuestion { get; set; }
}
public class ReadingQuestionSystemView
@ -324,11 +328,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
/// <summary>
/// 排序
/// </summary>
@ -359,7 +358,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 图片数量
/// </summary>
public int ImageCount { get; set; }
public int ImageCount { get; set; }
/// <summary>
/// 是否是必须
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 是否显示
/// </summary>
public ShowQuestion ShowQuestion { get; set; }
}
@ -564,11 +574,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; } = false;
/// <summary>
/// 排序
/// </summary>
@ -597,6 +602,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public bool IsEnable { get; set; } = false;
/// <summary>
/// 是否是必须
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 是否显示
/// </summary>
public ShowQuestion ShowQuestion { get; set; }
/// <summary>
/// 图片数量
@ -658,11 +673,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string QuestionName { get; set; }
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; } = false;
/// <summary>
/// 排序
/// </summary>
@ -701,6 +711,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 图片数量
/// </summary>
public int ImageCount { get; set; } = 0;
/// <summary>
/// 是否是必须
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// 是否显示
/// </summary>
public ShowQuestion ShowQuestion { get; set; }
}

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -690,6 +690,7 @@ namespace IRaCIS.Application.Services
GroupName = data.GroupName,
QuestionName = data.QuestionName,
IsRequired = data.IsRequired,
ShowQuestion=data.ShowQuestion,
ShowOrder = data.ShowOrder,
RelevanceId=data.RelevanceId,
RelevanceValue=data.RelevanceValue,
@ -801,6 +802,7 @@ namespace IRaCIS.Application.Services
ParentId = data.ParentId,
TypeValue = data.TypeValue,
Answer = string.Empty,
ShowQuestion=data.ShowQuestion,
PageShowOrder = data.ShowOrder,
Type=data.Type,
};

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

@ -324,7 +324,8 @@ namespace IRaCIS.Application.Services
AnswerGroup= (c.trial.FirstOrDefault()?.AnswerGroup) ?? string.Empty,
GroupName=c.system.GroupName,
IsEnable=c.system.IsEnable,
IsJudgeQuestion=c.system.IsJudgeQuestion,
ShowQuestion= c.system.ShowQuestion,
IsJudgeQuestion =c.system.IsJudgeQuestion,
IsRequired=c.system.IsRequired,
JudgeType = (c.trial.FirstOrDefault()?.JudgeType)??JudgeTypeEnum.None,
ParentId = c.trial.FirstOrDefault()?.ParentId,

43
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -222,6 +222,49 @@ namespace IRaCIS.Core.Domain.Share
}
/// <summary>
/// 是否必填
/// </summary>
public enum IsRequired
{
/// <summary>
/// 必填
/// </summary>
Required = 0,
/// <summary>
/// 不必填
/// </summary>
NotRequired = 1,
/// <summary>
/// 依赖父问题
/// </summary>
Rely = 2,
}
/// <summary>
/// 是否显示问题
/// </summary>
public enum ShowQuestion
{
/// <summary>
/// 显示
/// </summary>
Show=0,
/// <summary>
/// 不显示
/// </summary>
Hide=1,
/// <summary>
/// 依赖父问题
/// </summary>
Rely=2,
}
/// <summary>
/// 阅片状态
/// </summary>

7
IRaCIS.Core.Domain/Reading/ReadingQuestionSystem.cs
View File

@ -37,7 +37,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
public IsRequired IsRequired { get; set; }
/// <summary>
/// 排序
@ -84,6 +84,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public int ImageCount { get; set; } = 1;
/// <summary>
/// 是否显示
/// </summary>
public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show;
/// <summary>
/// 创建人
/// </summary>

9
IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs
View File

@ -42,7 +42,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; }
public IsRequired IsRequired { get; set; }
/// <summary>
/// 排序
@ -130,7 +130,12 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 图片数量
/// </summary>
public int ImageCount { get; set; } = 0;
public int ImageCount { get; set; } = 1;
/// <summary>
/// 是否显示
/// </summary>
public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show;
/// <summary>
/// 分页标准