修改稽查
This commit is contained in:
@@ -285,19 +285,44 @@ namespace IRaCIS.Core.Application.Service
|
||||
}
|
||||
|
||||
|
||||
item.JsonStr = jsonDict[nameof(InspectionJsonDetail.Data)].ToString();
|
||||
if (item.Identification == string.Empty || item.JsonStr == string.Empty)
|
||||
#region Old
|
||||
//item.JsonStr = jsonDict[nameof(InspectionJsonDetail.Data)].ToString();
|
||||
//if (item.Identification == string.Empty || item.JsonStr == string.Empty)
|
||||
//{
|
||||
// continue;
|
||||
//}
|
||||
//item.JsonStr = await GetInspectionEnumValue(listIdentification, item.JsonStr);
|
||||
//item.JsonStr = await SetEnum(dto.TrialId, listIdentification, item.JsonStr);
|
||||
//item.JsonStr = await SetDataInspectionDateType(listIdentification, item.JsonStr);
|
||||
|
||||
//jsonDict[nameof(InspectionJsonDetail.Data)] = JsonConvert.DeserializeObject<object>(item.JsonStr);
|
||||
#endregion
|
||||
|
||||
#region New
|
||||
|
||||
var str = jsonDict[nameof(InspectionJsonDetail.Data)].ToString();
|
||||
if (item.Identification == string.Empty || str == string.Empty)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
item.JsonStr = await GetInspectionEnumValue(listIdentification, item.JsonStr);
|
||||
item.JsonStr = await SetEnum(dto.TrialId, listIdentification, item.JsonStr);
|
||||
item.JsonStr = await SetDataInspectionDateType(listIdentification, item.JsonStr);
|
||||
str = await GetInspectionEnumValue(listIdentification, str);
|
||||
str = await SetEnum(dto.TrialId, listIdentification, str);
|
||||
str = await SetDataInspectionDateType(listIdentification, str);
|
||||
|
||||
jsonDict[nameof(InspectionJsonDetail.Data)] = JsonConvert.DeserializeObject<object>(str);
|
||||
|
||||
|
||||
var str2 = jsonDict[nameof(InspectionJsonDetail.CommonData)].ToJsonStr();
|
||||
if (item.Identification == string.Empty || str2 == string.Empty)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
str2 = await GetInspectionEnumValue(listIdentification, str2);
|
||||
str2 = await SetEnum(dto.TrialId, listIdentification, str2);
|
||||
str2 = await SetDataInspectionDateType(listIdentification, str2);
|
||||
|
||||
|
||||
jsonDict[nameof(InspectionJsonDetail.Data)] = JsonConvert.DeserializeObject<object>(item.JsonStr);
|
||||
jsonDict[nameof(InspectionJsonDetail.CommonData)] = JsonConvert.DeserializeObject<object>(str2);
|
||||
#endregion
|
||||
|
||||
item.JsonStr = JsonConvert.SerializeObject(jsonDict);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user