From 96f3ecb45da58aaeb43ee6f63c180c196701f6b5 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 28 May 2024 14:33:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/AuditingData.cs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index b4424a4e9..05f385679 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -1419,19 +1419,25 @@ namespace IRaCIS.Core.Infra.EFCore.Common var trialSiteId = entity.TrialSite?.Id; - await InsertInspection(item.Entity as TrialSiteSurvey, type, x => new InspectionConvertDTO() + var equipmentTypeList = await _dbContext.TrialSiteEquipmentSurvey.Where(x => x.TrialSiteSurveyId == entity.Id).Select(x => x.EquipmentType).ToListAsync(); + + + var siteUserList = await _dbContext.TrialSiteUserSurvey.Where(x => x.TrialSiteSurveyId == entity.Id).Select(x => x.LastName + "/" + x.FirstName).ToListAsync(); + + await InsertInspection(item.Entity as TrialSiteSurvey, type, x => new InspectionConvertDTO() { ObjectRelationParentId = trialSiteId, }, new { - //TrialSiteCode = entity.TrialSite.TrialSiteCode, - //TrialSiteAliasName = entity.TrialSite.TrialSiteAliasName, - //Phone = entity.Phone, - //Email = entity.Email, + //TrialSiteCode = entity.TrialSite.TrialSiteCode, + //TrialSiteAliasName = entity.TrialSite.TrialSiteAliasName, + //Phone = entity.Phone, + //Email = entity.Email, - - PreliminaryUser = entity.PreliminaryUser == null ? "" : entity.PreliminaryUser.FullName, + EquipmentTypeList=string.Join(",", equipmentTypeList), + SiteUserList= string.Join(",", siteUserList), + PreliminaryUser = entity.PreliminaryUser == null ? "" : entity.PreliminaryUser.FullName, ReviewerUser = entity.ReviewerUser == null ? "" : entity.ReviewerUser.FullName, });