修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
61278375ba
commit
9385e22c58
|
@ -1632,6 +1632,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
|
||||
public string Type { get; set; }
|
||||
|
||||
public List<string> TypeList { get; set; } = new List<string>();
|
||||
|
||||
}
|
||||
|
||||
public class GetTrialGroupNameOutDto
|
||||
|
|
|
@ -93,7 +93,8 @@ namespace IRaCIS.Core.Application.Service
|
|||
var result = await _readingQuestionTrialRepository
|
||||
|
||||
.Where(x => x.ReadingQuestionCriterionTrialId == inDto.TrialCriterionId)
|
||||
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
|
||||
.WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
|
||||
.WhereIf(inDto.TypeList.Count()>0, x => inDto.TypeList.Contains(x.Type))
|
||||
.OrderBy(x => x.ShowOrder)
|
||||
.Select(x => new GetCalculateQuestionsOutDto
|
||||
()
|
||||
|
@ -380,7 +381,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
{
|
||||
var types = new List<string>()
|
||||
{
|
||||
"select","radio"
|
||||
"select","radio","class",
|
||||
};
|
||||
var questionList = await _readingTableQuestionSystemRepository.Where(x => x.ReadingQuestionId == inDto.ReadingQuestionId)
|
||||
.Where(x => types.Contains(x.Type))
|
||||
|
@ -610,7 +611,7 @@ namespace IRaCIS.Core.Application.Service
|
|||
{
|
||||
var types = new List<string>()
|
||||
{
|
||||
"select","radio"
|
||||
"select","radio","class",
|
||||
};
|
||||
var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
|
||||
.Where(x => types.Contains(x.Type))
|
||||
|
|
Loading…
Reference in New Issue