修改稽查
This commit is contained in:
@@ -238,6 +238,11 @@ namespace IRaCIS.Core.Application.Service
|
||||
{
|
||||
Dictionary<string, object> jsonDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(item.JsonStr);
|
||||
|
||||
if (!jsonDict.ContainsKey(nameof(InspectionJsonDetail.CommonData)))
|
||||
{
|
||||
jsonDict.Add(nameof(InspectionJsonDetail.CommonData), new { });
|
||||
}
|
||||
|
||||
//查询关联父层级数据
|
||||
if (item.Id == currentInspectionId)
|
||||
{
|
||||
@@ -247,6 +252,8 @@ namespace IRaCIS.Core.Application.Service
|
||||
|
||||
var commonDataObjList = await GetRelationParentData( item.Id,item.ObjectRelationParentId, item.ObjectRelationParentId2, item.CreateTime, item.BatchId, objectLsit);
|
||||
|
||||
|
||||
|
||||
var currentDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(jsonDict[nameof(InspectionJsonDetail.CommonData)].ToJsonStr());
|
||||
|
||||
foreach (var commonDataObj in commonDataObjList)
|
||||
@@ -359,10 +366,13 @@ namespace IRaCIS.Core.Application.Service
|
||||
{
|
||||
Dictionary<string, object> jsonDic = JsonConvert.DeserializeObject<Dictionary<string, object>>(relationParentInspection.JsonDetail);
|
||||
|
||||
if (jsonDic.ContainsKey(nameof(InspectionJsonDetail.CommonData)))
|
||||
{
|
||||
var commonDataDicObj = jsonDic[nameof(InspectionJsonDetail.CommonData)];
|
||||
|
||||
var commonDataDicObj = jsonDic[nameof(InspectionJsonDetail.CommonData)];
|
||||
objectLsit.Add(commonDataDicObj);
|
||||
}
|
||||
|
||||
objectLsit.Add(commonDataDicObj);
|
||||
|
||||
//避免对象信息记录 把 Data里面的信息也取过去 但是加上稽查对象的前缀
|
||||
var dataDicObj = jsonDic[nameof(InspectionJsonDetail.Data)];
|
||||
|
||||
Reference in New Issue
Block a user