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

修改

Uat_Study
he 2022-09-15 14:39:24 +08:00
parent cc963ee9f6
commit 65d23a4d91
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1081,7 +1081,7 @@ namespace IRaCIS.Application.Services
.Select(x => x.ReadingQuestionCriterionSystemId); .Select(x => x.ReadingQuestionCriterionSystemId);
var trialCriterionNames= _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId) var trialCriterionNames= _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId)
.Select(x => x.CriterionName); .Select(x => x.CriterionName);
var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)&&x.Dictionary.IsEnable&& !trialCriterionNames.Contains(x.CriterionName)).Include(x=>x.ReadingQuestionSystemList).ToListAsync(); var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)&&x.IsEnable&& !trialCriterionNames.Contains(x.CriterionName)).Include(x=>x.ReadingQuestionSystemList).ToListAsync();
List<ReadingQuestionCriterionTrial> needAddCriterionList = new List<ReadingQuestionCriterionTrial>(); List<ReadingQuestionCriterionTrial> needAddCriterionList = new List<ReadingQuestionCriterionTrial>();
List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>(); List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>();
needAddSystemDataList.ForEach(x => needAddSystemDataList.ForEach(x =>

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

@ -118,9 +118,9 @@ namespace IRaCIS.Core.Application.Service
CreateMap<AddOrUpdateReadingQuestionCriterionSystemInDto, ReadingQuestionCriterionSystem>(); CreateMap<AddOrUpdateReadingQuestionCriterionSystemInDto, ReadingQuestionCriterionSystem>();
CreateMap<ReadingQuestionCriterionSystem, ReadingQuestionCriterionSystemView>() CreateMap<ReadingQuestionCriterionSystem, ReadingQuestionCriterionSystemView>()
.ForMember(d => d.QuestionCount, u => u.MapFrom(s => s.ReadingQuestionSystemList.Count())) .ForMember(d => d.QuestionCount, u => u.MapFrom(s => s.ReadingQuestionSystemList.Count()));
.ForMember(d => d.IsEnable, u => u.MapFrom(s => s.Dictionary.IsEnable)) //.ForMember(d => d.IsEnable, u => u.MapFrom(s => s.Dictionary.IsEnable))
.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.Dictionary.ShowOrder)); //.ForMember(d => d.ShowOrder, u => u.MapFrom(s => s.Dictionary.ShowOrder));
CreateMap<AddOrUpdateReadingQuestionSystemInDto, ReadingQuestionSystem>(); CreateMap<AddOrUpdateReadingQuestionSystemInDto, ReadingQuestionSystem>();

6
IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs
View File

@ -52,9 +52,9 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore] [JsonIgnore]
public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>(); public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>();
[JsonIgnore] //[JsonIgnore]
[ForeignKey("CriterionId")] //[ForeignKey("CriterionId")]
public Dictionary Dictionary { get; set; } //public Dictionary Dictionary { get; set; }
} }