admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-04-29 15:57:09 +00:00
parent 98123ddaf8
commit b9313439f6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -153,7 +153,7 @@ namespace AyaNova.Biz
var ret = var ret =
await ct.WorkOrder.AsNoTracking() await ct.WorkOrder.AsNoTracking()
.Include(s => s.States) .Include(s => s.States)
.Include(w => w.Items) .Include(w => w.Items.OrderBy(item=>item.Sequence))
.ThenInclude(wi => wi.Expenses) .ThenInclude(wi => wi.Expenses)
.Include(w => w.Items) .Include(w => w.Items)
.ThenInclude(wi => wi.Labors) .ThenInclude(wi => wi.Labors)
@@ -506,7 +506,7 @@ namespace AyaNova.Biz
idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray(); idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray();
List<WorkOrder> batchResults = new List<WorkOrder>(); List<WorkOrder> batchResults = new List<WorkOrder>();
foreach (long batchId in batch) foreach (long batchId in batch)
batchResults.Add(await WorkOrderGetAsync(batchId, false)); batchResults.Add(await WorkOrderGetAsync(batchId, true, false));
//order the results back into original //order the results back into original
var orderedList = from id in batch join z in batchResults on id equals z.Id select z; var orderedList = from id in batch join z in batchResults on id equals z.Id select z;
@@ -514,7 +514,8 @@ namespace AyaNova.Biz
foreach (WorkOrder w in orderedList) foreach (WorkOrder w in orderedList)
{ {
//populate entire workorder graph //populate entire workorder graph
await WorkOrderPopulateVizFields(w); //await WorkOrderPopulateVizFields(w);
//this is done by the initial fetch now
var jo = JObject.FromObject(w); var jo = JObject.FromObject(w);