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

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

Browse Source
This commit is contained in:
hang
2024-08-22 18:10:29 +08:00
parent f0943ca9a4
commit 4319982be9
159 changed files with 520 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs
+5 -4
View File
@@ -12,9 +12,12 @@ namespace IRaCIS.Core.Domain.Models
///SystemDocConfirmedUser
///</summary>
[Table("SystemDocConfirmedUser")]
public class SystemDocConfirmedUser : Entity, IAuditAdd,ISoftDelete
public class SystemDocConfirmedUser : BaseAuditAddEntity, ISoftDelete
{
{
#region 导航属性
#endregion
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
@@ -46,9 +49,7 @@ namespace IRaCIS.Core.Domain.Models
public string SignText { get; set; } = string.Empty;
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
/// <summary>
/// 是否废除
IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs
+9 -13
View File
@@ -14,22 +14,18 @@ namespace IRaCIS.Core.Domain.Models
[Table("SystemDocNeedConfirmedUserType")]
public class SystemDocNeedConfirmedUserType : Entity
{
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
#endregion
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
/// <summary>
/// SystemDocumentId
/// </summary>
[Required]
public Guid SystemDocumentId { get; set; }
/// <summary>
/// NeedConfirmUserTypeId
/// </summary>
[Required]
public Guid NeedConfirmUserTypeId { get; set; }
}
IRaCIS.Core.Domain/Document/SystemDocument.cs
+10 -50
View File
@@ -13,71 +13,31 @@ namespace IRaCIS.Core.Domain.Models
///SystemDocument
///</summary>
[Table("SystemDocument")]
public class SystemDocument : Entity, IAuditUpdate, IAuditAdd,ISoftDelete
public class SystemDocument : BaseFullAuditDeleteEntity
{
#region 导航属性
[JsonIgnore]
public List<SystemDocConfirmedUser> SystemDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public List<SystemDocConfirmedUser> SystemDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
public Guid FileTypeId { get; set; }
/// <summary>
/// Name
/// </summary>
[Required]
public string Name { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
/// <summary>
/// Path
/// </summary>
[Required]
public string Path { get; set; } = string.Empty;
/// <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; }
public DateTime? DeletedTime { get; set; }
public bool IsDeleted { get; set; }
public Guid? DeleteUserId { get; set; }
}
}
IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs
+13 -23
View File
@@ -12,35 +12,27 @@ namespace IRaCIS.Core.Domain.Models
///TrialDocUserTypeConfirmUser
///</summary>
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : Entity, IAuditAdd,ISoftDelete
public class TrialDocConfirmedUser : BaseAuditAddEntity,ISoftDelete
{
//public Guid TrialId { get; set; }
#region 导航属性
//public TrialUser TrialUser { get; set; }
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
[JsonIgnore]
[ForeignKey("ConfirmUserId")]
public User User { get; set; }
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
/// <summary>
/// TrialDocumentId
/// </summary>
[Required]
public Guid TrialDocumentId { get; set; }
/// <summary>
/// ConfirmTime
/// </summary>
public Guid TrialDocumentId { get; set; }
public DateTime? ConfirmTime { get; set; }
/// <summary>
/// ConfirmUserId
/// </summary>
[Required]
public Guid ConfirmUserId { get; set; }
[JsonIgnore]
[ForeignKey("ConfirmUserId")]
public User User { get; set; }
public Guid ConfirmUserId { get; set; }
public DateTime? SignFirstViewTime { get; set; }
@@ -48,9 +40,7 @@ namespace IRaCIS.Core.Domain.Models
public string SignText { get; set; } = string.Empty;
public Guid CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
/// <summary>
/// 是否废除
IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs
+8 -15
View File
@@ -15,28 +15,21 @@ namespace IRaCIS.Core.Domain.Models
[Table("TrialDocNeedConfirmedUserType")]
public class TrialDocNeedConfirmedUserType : Entity
{
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
/// <summary>
/// TrialDocumentId
/// </summary>
[Required]
public Guid TrialDocumentId { get; set; }
public Guid TrialDocumentId { get; set; }
[Required]
public Guid NeedConfirmUserTypeId { get; set; }
//[ForeignKey("NeedConfirmUserTypeId")]
//public UserTypeRole UserTypeRole { get; set; }
}
IRaCIS.Core.Domain/Document/TrialDocument.cs
+15 -62
View File
@@ -13,83 +13,36 @@ namespace IRaCIS.Core.Domain.Models
///TrialDocument
///</summary>
[Table("TrialDocument")]
public class TrialDocument : Entity, IAuditUpdate, IAuditAdd
public class TrialDocument : BaseFullAuditDeleteEntity
{
#region 导航属性
[JsonIgnore]
public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
//需要确认的项目用户 通过TrialId 关联 用中间表过滤
[JsonIgnore]
public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
//需要确认的项目用户 通过TrialId 关联 用中间表过滤
public Guid FileTypeId { get; set; }
public Guid FileTypeId { get; set; }
/// <summary>
/// Name
/// </summary>
[Required]
public string Name { get; set; } = string.Empty;
/// <summary>
/// Path
/// </summary>
[Required]
public string Path { get; set; } = string.Empty;
/// <summary>
/// TrialId
/// </summary>
[Required]
public Guid TrialId { get; set; }
/// <summary>
/// Description
/// </summary>
[Required]
public string Description { get; set; } = string.Empty;
public int SignViewMinimumMinutes { 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; }
public DateTime? DeletedTime { get; set; }
public bool IsDeleted { get; set; }
}
IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
+18 -33
View File
@@ -16,13 +16,29 @@ namespace IRaCIS.Core.Domain.Models
///TrialEmailNoticeConfig
///</summary>
[Table("TrialEmailNoticeConfig")]
public class TrialEmailNoticeConfig : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
public class TrialEmailNoticeConfig : BaseFullAuditDeleteEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[Required]
[JsonIgnore]
public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();
[JsonIgnore]
public List<TrialEmailBlackUser> TrialEmailBlackUserList { get; set; } = new List<TrialEmailBlackUser>();
[JsonIgnore]
public EmailNoticeConfig SysEmailNoticeConfig { get; set; }
[ForeignKey("TrialReadingCriterionId")]
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
public Guid TrialId { get; set; }
@@ -30,7 +46,6 @@ namespace IRaCIS.Core.Domain.Models
public int SMTPServerPort { get; set; }
[Required]
public string AuthorizationCode { get; set; } = string.Empty;
@@ -39,10 +54,6 @@ namespace IRaCIS.Core.Domain.Models
public string FromEmail { get; set; } = string.Empty;
[JsonIgnore]
public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();
public List<TrialEmailBlackUser> TrialEmailBlackUserList { get; set; } = new List<TrialEmailBlackUser>();
/// <summary> 业务模块 /// </summary>
@@ -81,10 +92,6 @@ namespace IRaCIS.Core.Domain.Models
public string EmailHtmlContentCN { get; set; } = string.Empty;
[JsonIgnore]
public EmailNoticeConfig SysEmailNoticeConfig { get; set; }
public Guid? SysEmailNoticeConfigId { get; set; }
@@ -106,28 +113,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid? TrialReadingCriterionId { get; set; }
[ForeignKey("TrialReadingCriterionId")]
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[Required]
public Guid CreateUserId { get; set; }
[Required]
public DateTime CreateTime { get; set; }
[Required]
public Guid UpdateUserId { get; set; }
[Required]
public DateTime UpdateTime { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
}