From ea84e9e1a65f9ca5a24607edf4677115a819f457 Mon Sep 17 00:00:00 2001
From: "{872297557@qq.com}" <872297557@qq.com>
Date: Mon, 19 Dec 2022 15:38:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=BE=E7=BD=B2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=A8=BD=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs   |  2 +
 .../Document/SystemDocConfirmedUser.cs        | 73 ++++++++++---------
 .../Document/TrialDocConfirmedUser.cs         |  6 +-
 .../Common/AuditingData.cs                    | 20 +++++
 4 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs
index d6a9eb86..8cfa535b 100644
--- a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs
+++ b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs
@@ -12,4 +12,6 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid? DeleteUserId { get; set; }
     }
+
+    
 }
diff --git a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs
index 69028e63..9aa8ad3e 100644
--- a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs
+++ b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs
@@ -8,52 +8,57 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
-	 ///SystemDocConfirmedUser
-	 ///</summary>
-	 [Table("SystemDocConfirmedUser")]	
-	 public class SystemDocConfirmedUser : Entity,IAuditAdd
-	 {
+    ///<summary>
+    ///SystemDocConfirmedUser
+    ///</summary>
+    [Table("SystemDocConfirmedUser")]
+    public class SystemDocConfirmedUser : Entity, IAuditAdd,ISoftDelete
 
-		public SystemDocument SystemDocument { get; set; }
+     {
 
-		[ForeignKey("ConfirmUserId")]
-		public User User { get; set; }
+        public SystemDocument SystemDocument { get; set; }
 
-		/// <summary>
-		/// TrialDocumentId
-		/// </summary>
-		[Required]
-		public Guid SystemDocumentId { get; set; }
-	
-		/// <summary>
+        [ForeignKey("ConfirmUserId")]
+        public User User { get; set; }
+
+        /// <summary>
+        /// TrialDocumentId
+        /// </summary>
+        [Required]
+        public Guid SystemDocumentId { get; set; }
+
+        /// <summary>
         /// ConfirmTime
         /// </summary>
-		public DateTime? ConfirmTime { get; set; }
-	
-		/// <summary>
+        public DateTime? ConfirmTime { get; set; }
+
+        /// <summary>
         /// ConfirmUserId
         /// </summary>
-		[Required]
-		public Guid ConfirmUserId { get; set; }
-	
-		/// <summary>
+        [Required]
+        public Guid ConfirmUserId { get; set; }
+
+        /// <summary>
         /// SignFirstViewTime
         /// </summary>
-		public DateTime? SignFirstViewTime { get; set; }
+        public DateTime? SignFirstViewTime { get; set; }
 
-		public string SignText { get; set; } = string.Empty;
+        public string SignText { get; set; } = string.Empty;
 
-		public Guid CreateUserId { get; set; }
+        public Guid CreateUserId { get; set; }
 
-		public DateTime CreateTime { get; set; }
+        public DateTime CreateTime { get; set; }
 
-		/// <summary>
-		/// 是否废除
-		/// </summary>
-		public bool IsDeleted { get; set; }
-		
+        /// <summary>
+        /// 是否废除
+        /// </summary>
+        public bool IsDeleted { get; set; }
 
-	}
+        public DateTime? DeletedTime { get; set; }
 
-}	 
+        public Guid? DeleteUserId { get; set; }
+
+
+    }
+
+}
diff --git a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs
index 28fc3588..02a1fadd 100644
--- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs
+++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs
@@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models
 	 ///TrialDocUserTypeConfirmUser
 	 ///</summary>
 	 [Table("TrialDocConfirmedUser")]	
-	 public class TrialDocConfirmedUser : Entity, IAuditAdd
+	 public class TrialDocConfirmedUser : Entity, IAuditAdd,ISoftDelete
 	{
 		//public Guid TrialId { get; set; }
 
@@ -56,6 +56,10 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public bool IsDeleted { get; set; }
 
+		public DateTime? DeletedTime { get; set; }
+
+		public Guid? DeleteUserId { get; set; }
+
 	}
 
 	
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index ea909036..18184e84 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -2096,7 +2096,24 @@ namespace IRaCIS.Core.Infra.EFCore.Common
 
             switch (entityObj.GetType().Name)
             {
+                case nameof(TrialDocConfirmedUser):
+                case nameof(SystemDocConfirmedUser):
 
+                    var softDelete = entityObj as ISoftDelete;
+
+                    if (type == AuditOpt.Update)
+                    {
+                        if (softDelete.IsDeleted == true)
+                        {
+                            type = type + "/" + 2;
+                        }
+                        else
+                        {
+                            type = type + "/" + 1;
+                        }
+                    }
+
+                    break;
 
                 case nameof(SystemBasicData):
                     var basicData = entityObj as SystemBasicData;
@@ -2138,6 +2155,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
                     }
                     break;
 
+
+
+
                 #region 访视相关
 
                 //  对话消息区分用户类型