修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
d04b425d62
commit
e022eb058b
|
@ -859,6 +859,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public class ReadingQuestionCriterionSystemViewInDto : PageInput
|
public class ReadingQuestionCriterionSystemViewInDto : PageInput
|
||||||
{
|
{
|
||||||
public string CriterionName { get; set; } = String.Empty;
|
public string CriterionName { get; set; } = String.Empty;
|
||||||
|
|
||||||
|
public bool? IsCompleteConfig { get; set; }
|
||||||
|
public bool? IsEnable { get; set; }
|
||||||
|
public CriterionGroup? CriterionGroup { get; set; }
|
||||||
|
public CriterionType? CriterionType { get; set; }
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class CriterionList
|
public class CriterionList
|
||||||
|
|
|
@ -230,6 +230,10 @@ namespace IRaCIS.Core.Application.Service.RC
|
||||||
//await AddSystemQuestionCriterion();
|
//await AddSystemQuestionCriterion();
|
||||||
var query = _readingQuestionCriterionSystemRepository.AsQueryable()
|
var query = _readingQuestionCriterionSystemRepository.AsQueryable()
|
||||||
.WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName))
|
.WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName))
|
||||||
|
.WhereIf(inDto.IsEnable!=null, x => x.IsEnable== inDto.IsEnable)
|
||||||
|
.WhereIf(inDto.IsCompleteConfig != null, x => x.IsCompleteConfig == inDto.IsCompleteConfig)
|
||||||
|
.WhereIf(inDto.CriterionGroup != null, x => x.CriterionGroup == inDto.CriterionGroup)
|
||||||
|
.WhereIf(inDto.CriterionType != null, x => x.CriterionType == inDto.CriterionType)
|
||||||
.ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider);
|
.ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider);
|
||||||
|
|
||||||
return await query.ToPagedListAsync(inDto, nameof(ReadingQuestionCriterionSystemView.ShowOrder));
|
return await query.ToPagedListAsync(inDto, nameof(ReadingQuestionCriterionSystemView.ShowOrder));
|
||||||
|
|
Loading…
Reference in New Issue