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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-10-24 18:05:43 +08:00
parent cf6a7d9166 a4c12dcbeb
commit 5023f5ed31
3 changed files with 12 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
{ {

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

@ -232,9 +232,11 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingTableQuestionSystem, GetCalculateTableQuestionsOutDto>() CreateMap<ReadingTableQuestionSystem, GetCalculateTableQuestionsOutDto>()
.ForMember(d => d.QuestionId, u => u.MapFrom(s => s.Id))
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)); .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
CreateMap<ReadingTableQuestionTrial, GetCalculateTableQuestionsOutDto>() CreateMap<ReadingTableQuestionTrial, GetCalculateTableQuestionsOutDto>()
.ForMember(d => d.QuestionId, u => u.MapFrom(s => s.Id))
.ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName)); .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
@ -265,6 +267,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<ReadingQuestionSystem, ReadingQuestionTrial>() CreateMap<ReadingQuestionSystem, ReadingQuestionTrial>()
.ForMember(d => d.CreateUser, u => u.Ignore()) .ForMember(d => d.CreateUser, u => u.Ignore())
.ForMember(d => d.ReadingTableQuestionTrialList, u => u.Ignore())
.ForMember(d => d.ReadingQuestionSystemId, u => u.MapFrom(s => s.Id)); .ForMember(d => d.ReadingQuestionSystemId, u => u.MapFrom(s => s.Id));
CreateMap<ReadingTableAnswerRowInfo, TableAnsweRowInfo>() CreateMap<ReadingTableAnswerRowInfo, TableAnsweRowInfo>()