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

修改一版

Uat_Study
he 2022-07-14 14:32:32 +08:00
parent dac46d079d
commit 8e94426f1a
2 changed files with 18 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/ReadingImageTaskViewModel.cs
View File

@ -362,7 +362,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string? PageName { get; set; } public string? PageName { get; set; }
public bool IsPublicPage { get; set; } = false; public bool? IsPublicPage { get; set; }
public bool IsPage { get; set; } = false;
/// <summary> /// <summary>
/// 标准分页Id /// 标准分页Id

17
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -323,7 +323,7 @@ namespace IRaCIS.Application.Services
ReadingCriterionPageId=data.ReadingCriterionPageId, ReadingCriterionPageId=data.ReadingCriterionPageId,
PageName= leftpage.PageName, PageName= leftpage.PageName,
PageShowOrder = leftpage.ShowOrder, PageShowOrder = leftpage.ShowOrder,
IsPublicPage=leftpage.IsPublicPage, IsPublicPage=leftpage.IsPublicPage,
}; };
@ -340,7 +340,19 @@ namespace IRaCIS.Application.Services
var readingCriterionPageIds = qusetionList.OrderBy(x => x.PageShowOrder).Select(x => x.ReadingCriterionPageId).Distinct().ToList(); var readingCriterionPageIds = qusetionList.OrderBy(x => x.PageShowOrder).Select(x => x.ReadingCriterionPageId).Distinct().ToList();
foreach (var item in readingCriterionPageIds) foreach (var item in readingCriterionPageIds)
{ {
var newPageQusetionList = qusetionList.Where(x => x.ReadingCriterionPageId == item).ToList(); var newPageQusetionList = qusetionList.Where(x => x.ReadingCriterionPageId == item).ToList();
var firstData = newPageQusetionList.FirstOrDefault();
var page = new GetTrialReadingQuestionOutDto()
{
PageName = firstData.PageName,
IsPage = true,
IsPublicPage = firstData.IsPublicPage,
};
var pageGroupList = newPageQusetionList.Where(x => x.Type == "group").ToList(); var pageGroupList = newPageQusetionList.Where(x => x.Type == "group").ToList();
pageGroupList.ForEach(x => pageGroupList.ForEach(x =>
{ {
@ -350,7 +362,8 @@ namespace IRaCIS.Application.Services
this.FindChildQuestion(z, newPageQusetionList); this.FindChildQuestion(z, newPageQusetionList);
}); });
}); });
groupList.AddRange(pageGroupList); firstData.Childrens = pageGroupList;
groupList.Add(firstData);
} }