精简实体修改
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-08-22 18:10:29 +08:00
parent f0943ca9a4
commit 4319982be9
159 changed files with 520 additions and 2225 deletions
@@ -13,77 +13,31 @@ namespace IRaCIS.Core.Domain.Models
///TrialExternalUser
///</summary>
[Table("TrialExternalUser")]
public class TrialExternalUser : Entity, IAuditUpdate, IAuditAdd
public class TrialExternalUser : BaseFullAuditEntity
{
[JsonIgnore]
public Trial Trial { get; set; }
/// <summary>
/// TrialId
/// </summary>
[Required]
public Guid TrialId { get; set; }
public Guid UserTypeId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// UpdateTime
/// </summary>
[Required]
public DateTime UpdateTime { get; set; }
/// <summary>
/// UpdateUserId
/// </summary>
[Required]
public Guid UpdateUserId { get; set; }
/// <summary>
/// Phone
/// </summary>
[Required]
public string Phone { get; set; } = String.Empty;
/// <summary>
/// Email
/// </summary>
[Required]
public string Email { get; set; }
/// <summary>
/// FirstName
/// </summary>
[Required]
public string FirstName { get; set; }
/// <summary>
/// LastName
/// </summary>
[Required]
public string LastName { get; set; }
///// <summary>
///// 是否存在系统用户表中
///// </summary>
//[Required]
//public bool IsExist { get; set; }
public string OrganizationName { get; set; }=String.Empty;
+1 -11
View File
@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models
{
public class TrialSite : Entity, IAuditAdd, IAuditUpdate,ISoftDelete
public class TrialSite : BaseFullAuditDeleteEntity
{
public Guid TrialId { get; set; }
@@ -16,18 +16,8 @@ namespace IRaCIS.Core.Domain.Models
public string TrialSiteName { get; set; } = String.Empty;
public string TrialSiteAliasName { get; set; }=String.Empty;
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public DateTime? EnabledTime { get; set; }
public Guid? DeleteUserId { get; set; }
[JsonIgnore]
//导航属性
[ForeignKey("SiteId")]
@@ -13,31 +13,17 @@ namespace IRaCIS.Core.Domain.Models
///TrialSiteDicomAE
///</summary>
[Table("TrialSiteDicomAE")]
public class TrialSiteDicomAE : Entity, IAuditUpdate, IAuditAdd
public class TrialSiteDicomAE : BaseFullAuditDeleteEntity
{
public DateTime? DeletedTime { get; set; }
public Guid TrialId { get; set; }
public Guid UpdateUserId { get; set; }
public Guid? DeleteUserId { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime UpdateTime { get; set; }
public Guid TrialSiteId { get; set; }
@@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models
///UserTrialSite
///</summary>
[Table("TrialSiteUser")]
public class TrialSiteUser : Entity, IAuditUpdate, IAuditAdd,ISoftDelete
public class TrialSiteUser : BaseFullAuditDeleteEntity
{
@@ -26,25 +26,7 @@ namespace IRaCIS.Core.Domain.Models
[Required]
public Guid TrialId { get; set; }
public DateTime UpdateTime { get; set; }
public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; }
public Guid UpdateUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
public Guid TrialId { get; set; }
[JsonIgnore]
[ForeignKey("UserId")]
+2 -12
View File
@@ -9,7 +9,7 @@ namespace IRaCIS.Core.Domain.Models
/// 运维人员与项目关联关系表 - 实体
/// </summary>
[Table("TrialUser")]
public partial class TrialUser : Entity, IAuditUpdate, IAuditAdd ,ISoftDelete
public partial class TrialUser : BaseFullAuditDeleteEntity
{
public Guid UserId { get; set; }
public Guid TrialId { get; set; }
@@ -24,17 +24,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
public DateTime? RemoveTime { get; set; }
@@ -13,46 +13,18 @@ namespace IRaCIS.Core.Domain.Models
///TrialUserPreparation
///</summary>
[Table("TrialUserPreparation ")]
public class TrialUserPreparation : Entity, IAuditUpdate, IAuditAdd
public class TrialUserPreparation : BaseFullAuditEntity
{
/// <summary>
/// UserId
/// </summary>
[Required]
public Guid UserId { get; set; }
/// <summary>
/// TrialId
/// </summary>
[Required]
public Guid TrialId { get; set; }
/// <summary>
/// UpdateTime
/// </summary>
[Required]
public DateTime UpdateTime { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// UpdateUserId
/// </summary>
[Required]
public Guid UpdateUserId { get; set; }
public DateTime? ExpireTime { get; set; }