This commit is contained in:
@@ -315,7 +315,7 @@ namespace AyaNova.DataList
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
retList.Reverse();
|
//retList.Reverse();
|
||||||
return retList.ToArray();
|
return retList.ToArray();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace AyaNova.Biz
|
|||||||
//Get items indicated in id list in report format
|
//Get items indicated in id list in report format
|
||||||
//called by ReportBiz rendering code
|
//called by ReportBiz rendering code
|
||||||
Task<JArray> GetReportData(long[] idList);
|
Task<JArray> GetReportData(long[] idList);
|
||||||
|
const int REPORT_DATA_BATCH_SIZE = 100;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ namespace AyaNova.Biz
|
|||||||
{
|
{
|
||||||
internal class WidgetBiz : BizObject, IJobObject, ISearchAbleObject, IReportAbleObject
|
internal class WidgetBiz : BizObject, IJobObject, ISearchAbleObject, IReportAbleObject
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
internal WidgetBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles)
|
internal WidgetBiz(AyContext dbcontext, long currentUserId, long userTranslationId, AuthorizationRoles UserRoles)
|
||||||
{
|
{
|
||||||
ct = dbcontext;
|
ct = dbcontext;
|
||||||
@@ -284,17 +286,21 @@ namespace AyaNova.Biz
|
|||||||
|
|
||||||
|
|
||||||
public async Task<JArray> GetReportData(long[] idList)
|
public async Task<JArray> GetReportData(long[] idList)
|
||||||
{
|
{
|
||||||
JArray j = new JArray();
|
JArray j = new JArray();
|
||||||
while (idList.Any())
|
while (idList.Any())
|
||||||
{
|
{
|
||||||
var batch = idList.Take(100);
|
var batch = idList.Take(IReportAbleObject.REPORT_DATA_BATCH_SIZE);
|
||||||
idList = idList.Skip(100).ToArray();
|
idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray();
|
||||||
var res = await ct.Widget.Where(z => batch.Contains(z.Id)).ToArrayAsync();
|
//query for this batch, comes back in db natural order unfortunately
|
||||||
foreach(Widget w in res){
|
var batchResults = await ct.Widget.Where(z => batch.Contains(z.Id)).ToArrayAsync();
|
||||||
|
//order the results back into original
|
||||||
|
var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
|
||||||
|
foreach (Widget w in orderedList)
|
||||||
|
{
|
||||||
j.Add(JObject.FromObject(w));
|
j.Add(JObject.FromObject(w));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return j;
|
return j;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user