diff --git a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs index d6a9eb864..8cfa535b1 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 69028e639..9aa8ad3e5 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 { - /// - ///SystemDocConfirmedUser - /// - [Table("SystemDocConfirmedUser")] - public class SystemDocConfirmedUser : Entity,IAuditAdd - { + /// + ///SystemDocConfirmedUser + /// + [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; } - /// - /// TrialDocumentId - /// - [Required] - public Guid SystemDocumentId { get; set; } - - /// + [ForeignKey("ConfirmUserId")] + public User User { get; set; } + + /// + /// TrialDocumentId + /// + [Required] + public Guid SystemDocumentId { get; set; } + + /// /// ConfirmTime /// - public DateTime? ConfirmTime { get; set; } - - /// + public DateTime? ConfirmTime { get; set; } + + /// /// ConfirmUserId /// - [Required] - public Guid ConfirmUserId { get; set; } - - /// + [Required] + public Guid ConfirmUserId { get; set; } + + /// /// SignFirstViewTime /// - 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; } - /// - /// 是否废除 - /// - public bool IsDeleted { get; set; } - + /// + /// 是否废除 + /// + 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 28fc35887..02a1faddc 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 /// [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 /// 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 ea9090367..18184e843 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 访视相关 // 对话消息区分用户类型