This commit is contained in:
2022-03-24 22:29:44 +00:00
parent a978ff9829
commit ad8f2129b3
22 changed files with 177 additions and 160 deletions

View File

@@ -327,13 +327,13 @@ namespace AyaNova.Biz
return await GetReportData(dataListSelectedRequest, jobId);
}
public async Task<List<string>> ImportData(JArray ja)
public async Task<List<string>> ImportData(AyImportData importData)
{
List<string> ImportResult = new List<string>();
string ImportTag = $"imported-{FileUtil.GetSafeDateFileName()}";
var jsset = JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = new AyaNova.Util.JsonUtil.ShouldSerializeContractResolver(new string[] { "Concurrency", "Id", "CustomFields" }) });
foreach (JObject j in ja)
foreach (JObject j in importData.Data)
{
var w = j.ToObject<UnitModel>(jsset);
if (j["CustomFields"] != null)