From 82562e5bb79922368ceec563d0cc49a447545af6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 8 Mar 2021 18:09:06 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/biz/ContractBiz.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs index cde1e8b2..ca9a036a 100644 --- a/server/AyaNova/biz/ContractBiz.cs +++ b/server/AyaNova/biz/ContractBiz.cs @@ -482,7 +482,14 @@ MULTIPLE discount / markup ITEMS var batch = idList.Take(IReportAbleObject.REPORT_DATA_BATCH_SIZE); idList = idList.Skip(IReportAbleObject.REPORT_DATA_BATCH_SIZE).ToArray(); //query for this batch, comes back in db natural order unfortunately - var batchResults = await ct.Contract.AsNoTracking().Where(z => batch.Contains(z.Id)).ToArrayAsync(); + var batchResults = await ct.Contract.Include(z => z.ContractPartOverrideItems) + .Include(z => z.ContractServiceRateOverrideItems) + .Include(z => z.ContractTravelRateOverrideItems) + .Include(z => z.ServiceRateItems) + .Include(z => z.TravelRateItems) + .AsNoTracking() + .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;