XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改签署文件的稽查

Uat_Study
{872297557@qq.com} 2022-12-19 15:38:01 +08:00
parent 34a275a5cf
commit ea84e9e1a6
4 changed files with 66 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs
View File

@ -12,4 +12,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid? DeleteUserId { get; set; } public Guid? DeleteUserId { get; set; }
} }
} }

63
IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs
View File

@ -8,52 +8,57 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models
{ {
///<summary> ///<summary>
///SystemDocConfirmedUser ///SystemDocConfirmedUser
///</summary> ///</summary>
[Table("SystemDocConfirmedUser")] [Table("SystemDocConfirmedUser")]
public class SystemDocConfirmedUser : Entity,IAuditAdd public class SystemDocConfirmedUser : Entity, IAuditAdd,ISoftDelete
{
public SystemDocument SystemDocument { get; set; } {
[ForeignKey("ConfirmUserId")] public SystemDocument SystemDocument { get; set; }
public User User { get; set; }
/// <summary> [ForeignKey("ConfirmUserId")]
/// TrialDocumentId public User User { get; set; }
/// </summary>
[Required]
public Guid SystemDocumentId { get; set; }
/// <summary> /// <summary>
/// TrialDocumentId
/// </summary>
[Required]
public Guid SystemDocumentId { get; set; }
/// <summary>
/// ConfirmTime /// ConfirmTime
/// </summary> /// </summary>
public DateTime? ConfirmTime { get; set; } public DateTime? ConfirmTime { get; set; }
/// <summary> /// <summary>
/// ConfirmUserId /// ConfirmUserId
/// </summary> /// </summary>
[Required] [Required]
public Guid ConfirmUserId { get; set; } public Guid ConfirmUserId { get; set; }
/// <summary> /// <summary>
/// SignFirstViewTime /// SignFirstViewTime
/// </summary> /// </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>
/// 是否废除 /// 是否废除
/// </summary> /// </summary>
public bool IsDeleted { get; set; } public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
} }
} }

6
IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs
View File

@ -12,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models
///TrialDocUserTypeConfirmUser ///TrialDocUserTypeConfirmUser
///</summary> ///</summary>
[Table("TrialDocConfirmedUser")] [Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : Entity, IAuditAdd public class TrialDocConfirmedUser : Entity, IAuditAdd,ISoftDelete
{ {
//public Guid TrialId { get; set; } //public Guid TrialId { get; set; }
@ -56,6 +56,10 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public bool IsDeleted { get; set; } public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
} }

20
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -2096,7 +2096,24 @@ namespace IRaCIS.Core.Infra.EFCore.Common
switch (entityObj.GetType().Name) 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): case nameof(SystemBasicData):
var basicData = entityObj as SystemBasicData; var basicData = entityObj as SystemBasicData;
@ -2138,6 +2155,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
break; break;
#region 访视相关 #region 访视相关
// 对话消息区分用户类型 // 对话消息区分用户类型