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

修改

Uat_Study
he 2022-07-14 15:21:06 +08:00
parent 5be770e2bb
commit c4a7e8f632
1 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,26 +353,13 @@ namespace IRaCIS.Application.Services
IsPage = true, IsPage = true,
IsPublicPage = firstData.IsPublicPage, IsPublicPage = firstData.IsPublicPage,
}; };
var pageGroupList = newPageQusetionList.Where(x => x.Type == "group").ToList();
if (pageGroupList.Count()!=0) var pageGroupList = newPageQusetionList.Where(x => x.ParentId == null).ToList();
{
pageGroupList.ForEach(x =>
{
x.Childrens = newPageQusetionList.Where(y => y.GroupName == x.GroupName && y.ParentId == null && y.Type != "group").ToList();
x.Childrens.ForEach(z =>
{
this.FindChildQuestion(z, newPageQusetionList);
});
});
}
else
{
pageGroupList = newPageQusetionList.Where(x => x.ParentId == null).ToList();
pageGroupList.ForEach(x => pageGroupList.ForEach(x =>
{ {
this.FindChildQuestion(x, newPageQusetionList); this.FindChildQuestion(x, newPageQusetionList);
}); });
}
page.Childrens = pageGroupList; page.Childrens = pageGroupList;
groupList.Add(page); groupList.Add(page);
} }
@ -383,31 +370,14 @@ namespace IRaCIS.Application.Services
else else
{ {
qusetionList = qusetionList.Where(x => x.ReadingCriterionPageId == null).ToList(); qusetionList = qusetionList.Where(x => x.ReadingCriterionPageId == null).ToList();
groupList = qusetionList.Where(x => x.Type == "group").ToList();
if (groupList.Count() != 0)
{
groupList.ForEach(x =>
{
x.Childrens = qusetionList.Where(y => y.GroupName == x.GroupName && y.ParentId == null && y.Type != "group").ToList();
x.Childrens.ForEach(z =>
{
this.FindChildQuestion(z, qusetionList);
});
});
}
else
{
groupList = qusetionList.Where(x => x.ParentId == null).ToList(); groupList = qusetionList.Where(x => x.ParentId == null).ToList();
groupList.ForEach(x => groupList.ForEach(x =>
{ {
this.FindChildQuestion(x, qusetionList); this.FindChildQuestion(x, qusetionList);
}); });
}
result.SinglePage = groupList; result.SinglePage = groupList;