This commit is contained in:
2022-03-25 14:09:35 +00:00
parent 334d361007
commit 79ea7828c7

View File

@@ -364,7 +364,7 @@ namespace AyaNova.Biz
} }
vc.Clear(); vc.Clear();
return ReportData; return ReportData;
} }
private VizCache vc = new VizCache(); private VizCache vc = new VizCache();
@@ -414,7 +414,7 @@ namespace AyaNova.Biz
} }
} }
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////
// IMPORT EXPORT // IMPORT EXPORT
@@ -422,8 +422,6 @@ namespace AyaNova.Biz
public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId) public async Task<JArray> GetExportData(DataListSelectedRequest dataListSelectedRequest, Guid jobId)
{ {
//for now just re-use the report data code
//this may turn out to be the pattern for most biz object types but keeping it seperate allows for custom usage from time to time
return await GetReportData(dataListSelectedRequest, jobId); return await GetReportData(dataListSelectedRequest, jobId);
} }
@@ -435,6 +433,9 @@ namespace AyaNova.Biz
var jsset = JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = new AyaNova.Util.JsonUtil.ShouldSerializeContractResolver(new string[] { "Concurrency", "Id", "CustomFields" }) }); var jsset = JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = new AyaNova.Util.JsonUtil.ShouldSerializeContractResolver(new string[] { "Concurrency", "Id", "CustomFields" }) });
foreach (JObject j in importData.Data) foreach (JObject j in importData.Data)
{ {
var w = j.ToObject<Customer>(jsset); var w = j.ToObject<Customer>(jsset);
if (j["CustomFields"] != null) if (j["CustomFields"] != null)
w.CustomFields = j["CustomFields"].ToString(); w.CustomFields = j["CustomFields"].ToString();