XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改稽查

Uat_Study
hang 2022-08-24 10:53:51 +08:00
parent 96a0a7c7b9
commit ba5f68037e
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -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);
}

3
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -1089,7 +1089,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
EntityName = entityName,
Data = entityObj,
//后期通过关联 就不需要把 OtherItem 并入到Data中
Data = AddJsonItem(entityObj, otherItem) ,
CommonData = AddJsonItem(generalData, otherItem)