添加软删字段DeleteUserId

IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs

@@ -9,5 +9,7 @@ namespace IRaCIS.Core.Domain.Models
         bool IsDeleted { get; set; }
 
         public DateTime? DeletedTime { get; set; }
+
+        public Guid? DeleteUserId { get; set; }
     }
 }

IRaCIS.Core.Domain/Common/CommonDocument.cs

@@ -68,6 +68,8 @@ namespace IRaCIS.Core.Domain.Models
 
 		public DateTime? DeletedTime { get; set; }
 
+		public Guid? DeleteUserId { get; set; }
+
 		/// <summary>
 		/// Code
 		/// </summary>

IRaCIS.Core.Domain/Document/SystemDocument.cs

@@ -76,6 +76,8 @@ namespace IRaCIS.Core.Domain.Models
 
 		public bool IsDeleted { get; set; }
 
+		public Guid? DeleteUserId { get; set; }
+
 	}
 
 }	 

IRaCIS.Core.Domain/Image/DicomSeries.cs

@@ -58,6 +58,8 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsDeleted {get;set;}
         public DateTime? DeletedTime { get; set; }
 
+        public Guid? DeleteUserId { get; set; }
+
         public bool IsReading { get; set; } = true;
 
         public string BodyPartForEdit { get; set; } = string.Empty;

IRaCIS.Core.Domain/Image/DicomStudy.cs

@@ -102,6 +102,8 @@ namespace IRaCIS.Core.Domain.Models
 
         public DateTime? DeletedTime { get; set; }
 
+        public Guid? DeleteUserId { get; set; }
+
 
     }
 }

IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs

@@ -37,6 +37,8 @@ namespace IRaCIS.Core.Domain.Models
 
 		public bool IsDeleted { get; set; }
 
+		public Guid? DeleteUserId { get; set; }
+
 		/// <summary>
 		/// TrialId
 		/// </summary>

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -305,6 +305,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
         public DateTime? DeletedTime { get; set; }
+        public Guid? DeleteUserId { get; set; }
 
 
         //public Guid? ReviewTypeId { get; set; } = Guid.Empty;

IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs

@@ -23,6 +23,8 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsDeleted { get; set; }
         public DateTime? DeletedTime { get; set; }
 
+        public Guid? DeleteUserId { get; set; }
+
 
         //导航属性  
         [ForeignKey("SiteId")]

IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs

@@ -42,6 +42,8 @@ namespace IRaCIS.Core.Domain.Models
 
 		public DateTime? DeletedTime { get; set; }
 
+		public Guid? DeleteUserId { get; set; }
+
 
 		[ForeignKey("UserId")]
 		public User User { get; set; }

IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs

@@ -33,6 +33,8 @@ namespace IRaCIS.Core.Domain.Models
 
         public DateTime? DeletedTime { get; set; }
 
+        public Guid? DeleteUserId { get; set; }
+
 
         public DateTime? RemoveTime { get; set; }
 

IRaCIS.Core.Domain/Visit/Subject.cs

@@ -84,5 +84,7 @@ namespace IRaCIS.Core.Domain.Models
 
         public bool IsDeleted { get; set; }
         public DateTime? DeletedTime { get; set; }
+
+        public Guid? DeleteUserId { get; set; }
     }
 }

IRaCIS.Core.Domain/Visit/SubjectVisit.cs

@@ -142,6 +142,7 @@ namespace IRaCIS.Core.Domain.Models
         public bool IsDeleted { get; set; }
         public DateTime? DeletedTime { get; set; }
 
+        public Guid? DeleteUserId { get; set; }
 
 
         //导航属性

IRaCIS.Core.Domain/Visit/VisitStage.cs

@@ -38,5 +38,7 @@ namespace IRaCIS.Core.Domain.Models
         public  bool IsDeleted { get; set; }
         public DateTime? DeletedTime { get; set; }
 
+        public Guid? DeleteUserId { get; set; }
+
     }
 }

IRaCIS.Core.Infra.EFCore/Context/Triggers/SoftDeleteTrigger.cs

@@ -3,12 +3,19 @@ using System.Threading;
 using System.Threading.Tasks;
 using EntityFrameworkCore.Triggered;
 using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
 
 namespace IRaCIS.Core.Application.Triggers
 {
 
     public class SoftDeleteTrigger : IBeforeSaveTrigger<ISoftDelete>
     {
+        private readonly IUserInfo _userInfo;
+
+        public SoftDeleteTrigger(IUserInfo userInfo)
+        {
+            _userInfo = userInfo;
+        }
 
         //Generator  Detached 状态才会进去  误用
         //modelBuilder.Entity(entityType.ClrType).Property(nameof(ISoftDelete.DeletedTime)).HasValueGenerator<DeleteTimeGenerator>().ValueGeneratedOnAddOrUpdate();
@@ -18,7 +25,8 @@ namespace IRaCIS.Core.Application.Triggers
             {
                 if (context.Entity.IsDeleted)
                 {
-                    context.Entity.DeletedTime=DateTime.UtcNow.AddHours(8);
+                    context.Entity.DeleteUserId = _userInfo.Id;
+                    context.Entity.DeletedTime = DateTime.UtcNow.AddHours(8);
                 }
                 else
                 {
@@ -26,7 +34,7 @@ namespace IRaCIS.Core.Application.Triggers
                 }
             }
 
-            return  Task.CompletedTask;
+            return Task.CompletedTask;
 
         }
     }