修改一版
parent
dac46d079d
commit
8e94426f1a
|
@ -362,7 +362,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
|||
public string? PageName { get; set; }
|
||||
|
||||
|
||||
public bool IsPublicPage { get; set; } = false;
|
||||
public bool? IsPublicPage { get; set; }
|
||||
|
||||
public bool IsPage { get; set; } = false;
|
||||
|
||||
/// <summary>
|
||||
/// 标准分页Id
|
||||
|
|
|
@ -323,7 +323,7 @@ namespace IRaCIS.Application.Services
|
|||
ReadingCriterionPageId=data.ReadingCriterionPageId,
|
||||
PageName= leftpage.PageName,
|
||||
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();
|
||||
foreach (var item in readingCriterionPageIds)
|
||||
{
|
||||
|
||||
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();
|
||||
pageGroupList.ForEach(x =>
|
||||
{
|
||||
|
@ -350,7 +362,8 @@ namespace IRaCIS.Application.Services
|
|||
this.FindChildQuestion(z, newPageQusetionList);
|
||||
});
|
||||
});
|
||||
groupList.AddRange(pageGroupList);
|
||||
firstData.Childrens = pageGroupList;
|
||||
groupList.Add(firstData);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue