邮件发布

IRaCIS.Core.Domain/Common/CommonDocument.cs

@@ -15,24 +15,23 @@ namespace IRaCIS.Core.Domain.Models
 	 [Table("CommonDocument")]	
 	 public class CommonDocument : Entity, IAuditUpdate, IAuditAdd,ISoftDelete
 	 {
-	 
 
-	
-		/// <summary>
-        /// Name
-        /// </summary>
+
 		[Required]
-		public string Name { get; set; }
-	
-		/// <summary>
-        /// Path
-        /// </summary>
+		public string Code { get; set; } = String.Empty;
+
 		[Required]
-		public string Path { get; set; }
-	
+		public string Name { get; set; } = String.Empty;
+
 		/// <summary>
-        /// CreateTime
-        /// </summary>
+		/// Path
+		/// </summary>
+		[Required]
+		public string Path { get; set; } = String.Empty;
+
+		/// <summary>
+		/// CreateTime
+		/// </summary>
 		[Required]
 		public DateTime CreateTime { get; set; }
 	
@@ -53,12 +52,12 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		[Required]
 		public Guid UpdateUserId { get; set; }
-	
+
 		/// <summary>
-        /// Description
-        /// </summary>
+		/// Description
+		/// </summary>
 		[Required]
-		public string Description { get; set; }
+		public string Description { get; set; } = String.Empty;
 	
 		/// <summary>
         /// IsDeleted
@@ -70,26 +69,19 @@ namespace IRaCIS.Core.Domain.Models
 
 		public Guid? DeleteUserId { get; set; }
 
-		/// <summary>
-		/// Code
-		/// </summary>
-		[Required]
-		public string Code { get; set; }
-	
-		/// <summary>
-        /// FileTypeId
-        /// </summary>
-		[Required]
-		public Guid FileTypeId { get; set; }
-	
 
-		
-		public Guid ModuleTypeId { get; set; }
+		public CriterionType CriterionTypeEnum { get; set; }
+		public CommonDocumentFileType FileTypeEnum { get; set; }	
+		public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
 
 
-		public Dictionary FileType { get; set; }
+		//[Required]
+		//public Guid FileTypeId { get; set; }	
+		//public Guid ModuleTypeId { get; set; }
 
-		public Dictionary ModuleType { get; set; }
+
+		//public Dictionary FileType { get; set; }
+		//public Dictionary ModuleType { get; set; }
 
 	}
 

IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs

@@ -5,104 +5,103 @@
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+
 namespace IRaCIS.Core.Domain.Models
 {
     ///<summary>
     ///EmailNoticeConfig
     ///</summary>
     [Table("EmailNoticeConfig")]
-    public class EmailNoticeConfig : Entity, IAuditUpdate, IAuditAdd
+    public class EmailNoticeConfig : Entity, IAuditUpdate, IAuditAdd,ISoftDelete
     {
+        public string Code { get; set; } = String.Empty;
+
+        public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
+
+        /// <summary>
+        /// 是否区分标准
+        /// </summary>
+        public bool IsDistinguishCriteria { get; set; }
 
 
         /// <summary>
-        /// CreateTime
+        /// 是否需要回执
         /// </summary>
+        [Required]
+        public bool IsReturnRequired { get; set; }
+
+
+        [Required]
+        public bool IsUrgent { get; set; }
+
+        public bool IsAutoSend { get; set; }
+
+        public bool IsEnable { get; set; }
+
         [Required]
         public DateTime CreateTime { get; set; }
 
-        /// <summary>
-        /// CreateUserId
-        /// </summary>
+
         [Required]
         public Guid CreateUserId { get; set; }
 
-        /// <summary>
-        /// UpdateUserId
-        /// </summary>
+
         [Required]
         public Guid UpdateUserId { get; set; }
+        [Required]
+        public DateTime UpdateTime { get; set; }
+
+        public bool IsDeleted { get; set; }
+        [Required]
+
+        public DateTime? DeletedTime { get; set; }
+
+        public Guid? DeleteUserId { get; set; }
+
+
+
+
+
+        //public string CriteriaEnumStr { get; set; } = String.Empty;
+
+        //[NotMapped]
+        //public List<CriterionType> CriteriaEnumList => CriteriaEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries)
+
+        //    .Select(t=> (CriterionType)Enum.ToObject(typeof(CriterionType), Convert.ToInt32(t) )).ToList();
+
+
 
 
         [Required]
         public Guid ScenarioId { get; set; }
 
-
         [ForeignKey("ScenarioId")]
         public SystemBasicData Scenario { get; set; }
-
-        /// <summary>
-        /// UpdateTime
-        /// </summary>
-        [Required]
-        public DateTime UpdateTime { get; set; }
-
-        /// <summary>
-        /// Title
-        /// </summary>
         [Required]
         public string Title { get; set; } = String.Empty;
 
-        /// <summary>
-        /// Body
-        /// </summary>
         [Required]
         public string Body { get; set; } = String.Empty;
 
-        /// <summary>
-        /// FromEmail
-        /// </summary>
         [Required]
         public string FromEmail { get; set; } = String.Empty;
 
-        /// <summary>
-        /// ReceiveEmail
-        /// </summary>
+        public string AuthorizationCode { get; set; } = String.Empty;
+
+
         [Required]
         public string ReceiveEmail { get; set; } = String.Empty;
 
-        /// <summary>
-        /// CopyEmail
-        /// </summary>
         [Required]
         public string CopyEmail { get; set; } = String.Empty;
 
-        /// <summary>
-        /// IsReturnRequired
-        /// </summary>
-        [Required]
-        public bool IsReturnRequired { get; set; }
-
-        /// <summary>
-        /// IsUrgent
-        /// </summary>
-        [Required]
-        public bool IsUrgent { get; set; }
-
-        /// <summary>
-        /// IsEnable
-        /// </summary>
-        [Required]
-        public bool IsEnable { get; set; }
+       
 
 
-        public string AuthorizationCode { get; set; } = String.Empty;
-
-        public string Code { get; set; } = String.Empty;
-
-        public bool IsAutoSend { get; set; }
 
     }
 

IRaCIS.Core.Domain/Common/SystemBasicData.cs

@@ -17,57 +17,36 @@ namespace IRaCIS.Core.Domain.Models
 	 public class SystemBasicData : Entity, IAuditUpdate, IAuditAdd
 	 {
 	 
-		/// <summary>
-        /// Name
-        /// </summary>
 		[Required]
 		public string Name { get; set; }=string.Empty;
 	
-		/// <summary>
-        /// Value
-        /// </summary>
+
 		[Required]
 		public string Value { get; set; } = string.Empty;
 
-		/// <summary>
-		/// Description
-		/// </summary>
+
 		[Required]
 		public string Description { get; set; } = string.Empty;
 
-		/// <summary>
-		/// ShowOrder
-		/// </summary>
+
 		[Required]
 		public int ShowOrder { 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>
-        /// Code
-        /// </summary>
+
 		[Required]
 		public string Code { get; set; }