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

修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-10-24 15:48:58 +08:00
parent aa1ecaf1fe
commit 0b2c707ec7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1766,7 +1766,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
[NotDefault] [NotDefault]
public Guid QuestionId { get; set; } public Guid QuestionId { get; set; }
public string Type { get; set; } public string Type { get; set; } = string.Empty;
public List<string> TypeList { get; set; } = new List<string>();
} }

8
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
View File

@ -150,7 +150,10 @@ namespace IRaCIS.Core.Application.Service
var result = await _readingTableQuestionTrialRepository var result = await _readingTableQuestionTrialRepository
.Where(x => x.ReadingQuestionId == inDto.QuestionId) .Where(x => x.ReadingQuestionId == inDto.QuestionId)
.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) .OrderBy(x => x.ShowOrder)
.ProjectTo<GetCalculateTableQuestionsOutDto>(_mapper.ConfigurationProvider, new .ProjectTo<GetCalculateTableQuestionsOutDto>(_mapper.ConfigurationProvider, new
{ {
@ -172,7 +175,8 @@ namespace IRaCIS.Core.Application.Service
var result = await _readingTableQuestionSystemRepository var result = await _readingTableQuestionSystemRepository
.Where(x => x.ReadingQuestionId == inDto.QuestionId) .Where(x => x.ReadingQuestionId == inDto.QuestionId)
.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) .OrderBy(x => x.ShowOrder)
.ProjectTo<GetCalculateTableQuestionsOutDto>(_mapper.ConfigurationProvider, new .ProjectTo<GetCalculateTableQuestionsOutDto>(_mapper.ConfigurationProvider, new
{ {