From 2104677e46e2b52284454faed3f87578cc6400cc Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 26 Aug 2022 09:43:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inspection/FrontAuditConfigService.cs | 14 ++++- .../Common/AuditingData.cs | 61 ++++++++++--------- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index a3a01b563..42c184a08 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -238,6 +238,11 @@ namespace IRaCIS.Core.Application.Service { Dictionary jsonDict = JsonConvert.DeserializeObject>(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>(jsonDict[nameof(InspectionJsonDetail.CommonData)].ToJsonStr()); foreach (var commonDataObj in commonDataObjList) @@ -359,10 +366,13 @@ namespace IRaCIS.Core.Application.Service { Dictionary jsonDic = JsonConvert.DeserializeObject>(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)]; diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 371f85a1c..dc8ad6404 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -263,40 +263,45 @@ namespace IRaCIS.Core.Infra.EFCore.Common foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy))) { var entity = item.Entity as NoneDicomStudy; - var fileCount = await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == entity.Id).CountAsync(); - await InsertInspection(item.Entity as NoneDicomStudy, type, null, new - { - FileCount = fileCount, - }); + + await InsertInspection(item.Entity as NoneDicomStudy, type, null); + + //var fileCount = await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == entity.Id).CountAsync(); + + + //await InsertInspection(item.Entity as NoneDicomStudy, type, null, new + //{ + // FileCount = fileCount, + //}); } - // 非Dicom文件 - if (entitys.Any(x => x.Entity.GetType() == typeof(NoneDicomStudyFile))) - { - var noneDicomStudyfile = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)).Select(x => x.Entity).FirstOrDefault() as NoneDicomStudyFile; - var noneDicomStudy = await _dbContext.NoneDicomStudy.Where(x => x.Id == noneDicomStudyfile.NoneDicomStudyId).FirstOrDefaultAsync(); - if (noneDicomStudy != null) - { - var filecount = await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == noneDicomStudyfile.NoneDicomStudyId).CountAsync(); - var count = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)).ToList().Count; - if (type == "Deleted") - { - filecount = filecount - count; - } - else - { - filecount = filecount + count; - } + //// 非Dicom文件 + //if (entitys.Any(x => x.Entity.GetType() == typeof(NoneDicomStudyFile))) + //{ + // var noneDicomStudyfile = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)).Select(x => x.Entity).FirstOrDefault() as NoneDicomStudyFile; + // var noneDicomStudy = await _dbContext.NoneDicomStudy.Where(x => x.Id == noneDicomStudyfile.NoneDicomStudyId).FirstOrDefaultAsync(); + // if (noneDicomStudy != null) + // { + // var filecount = await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == noneDicomStudyfile.NoneDicomStudyId).CountAsync(); + // var count = entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile)).ToList().Count; + // if (type == "Deleted") + // { + // filecount = filecount - count; + // } + // else + // { + // filecount = filecount + count; + // } - await InsertInspection(noneDicomStudy, type, null, new - { - FileCount = filecount, - }); + // await InsertInspection(noneDicomStudy, type, null, new + // { + // FileCount = filecount, + // }); - } - } + // } + //}