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

系统邮件配置预先修改-001

Uat_Study
hang 2023-08-21 15:04:30 +08:00
parent 96e1a2c393
commit ca3f3b6f9d
5 changed files with 121 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs
View File

@ -36,9 +36,12 @@ namespace IRaCIS.Core.Application.Contracts
public CommonDocumentBusinessScenario? BusinessScenarioEnum { get; set; }
public bool? IsReturnRequired { get; set; }
public bool? IsUrgent { get; set; }
public bool? IsEnable { get; set; }
public CriterionType? CriterionTypeEnum { get; set; }
}
///<summary> EmailNoticeConfigAddOrEdit 列表查询参数模型</summary>
@ -47,7 +50,6 @@ namespace IRaCIS.Core.Application.Contracts
public Guid? Id { get; set; }
public string Code { get; set; } = String.Empty;
public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
/// <summary>
@ -55,20 +57,52 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public bool IsDistinguishCriteria { get; set; }
//public string AuthorizationCode { get; set; } = String.Empty;
//public Guid ScenarioId { get; set; }
//public string Title { get; set; } = String.Empty;
//public string Body { get; set; } = String.Empty;
//public string FromEmail { get; set; } = String.Empty;
//public string ReceiveEmail { get; set; } = String.Empty;
//public string CopyEmail { get; set; } = String.Empty;
public bool IsReturnRequired { get; set; }
public bool IsUrgent { get; set; }
public bool IsEnable { get; set; }
public bool IsAutoSend { get; set; }
public bool IsDeleted { get; set; }
public CriterionType? CriterionTypeEnum { get; set; }
/// <summary> 业务模块 /// </summary>
public int BusinessModuleEnum { get; set; }
/// <summary> 业务层级 /// </summary>
public int BusinessLevelEnum { get; set; }
/// <summary> 邮件类型 /// </summary>
public int EmailTypeEnum { get; set; }
/// <summary> 邮件加急类型 /// </summary>
public int EmailUrgentEnum { get; set; }
public string Description { get; set; } = string.Empty;
/// <summary> 定时周期 /// </summary>
public string EmailCron { get; set; } = string.Empty;
/// <summary> 邮件主题 /// </summary>
public string EmailTopic { get; set; } = string.Empty;
public string EmailTopicCN { get; set; } = string.Empty;
public string AttachPath { get; set; } = string.Empty;
public string AttachCNPath { get; set; } = string.Empty;
public string EmailHtmlContentPath { get; set; } = string.Empty;
public string EmailHtmlContentCNPath { get; set; } = string.Empty;
public string AttachName { get; set; }
public string AttachNameCN { get; set; }
public string EmailHtmlName { get; set; }
public string EmailHtmlNameCN { get; set; }
}

1
IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs
View File

@ -29,7 +29,6 @@ namespace IRaCIS.Core.Application.Contracts
var emailNoticeConfigQueryable = _emailNoticeConfigrepository
.WhereIf(queryEmailNoticeConfig.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == queryEmailNoticeConfig.BusinessScenarioEnum)
.WhereIf(queryEmailNoticeConfig.IsReturnRequired != null, t => t.IsReturnRequired == queryEmailNoticeConfig.IsReturnRequired)
.WhereIf(queryEmailNoticeConfig.IsUrgent != null, t => t.IsUrgent == queryEmailNoticeConfig.IsUrgent)
.WhereIf(queryEmailNoticeConfig.IsEnable != null, t => t.IsEnable == queryEmailNoticeConfig.IsEnable)
.ProjectTo<EmailNoticeConfigView>(_mapper.ConfigurationProvider);

68
IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
View File

@ -22,6 +22,47 @@ namespace IRaCIS.Core.Domain.Models
public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
/// <summary> 标准类型 /// </summary>
public CriterionType? CriterionTypeEnum { get; set; }
/// <summary> 业务模块 /// </summary>
public int BusinessModuleEnum { get; set; }
/// <summary> 业务层级 /// </summary>
public int BusinessLevelEnum { get; set; }
/// <summary> 邮件类型 /// </summary>
public int EmailTypeEnum { get; set; }
/// <summary> 邮件加急类型 /// </summary>
public int EmailUrgentEnum { get; set; }
/// <summary> 定时周期 /// </summary>
public string EmailCron { get; set; }=string.Empty;
/// <summary> 邮件主题 /// </summary>
public string EmailTopic { get; set; } = string.Empty;
public string EmailTopicCN { get; set; } = string.Empty;
/// <summary> 附件 /// </summary>
public string AttachPath { get; set; } = string.Empty;
public string AttachCNPath { get; set; } = string.Empty;
public string EmailHtmlContentPath { get; set; } = string.Empty;
public string EmailHtmlContentCNPath { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public string AttachName { get; set; }
public string AttachNameCN { get; set; }
public string EmailHtmlName { get; set; }
public string EmailHtmlNameCN { get; set; }
/// <summary>
/// 是否区分标准
/// </summary>
@ -34,10 +75,6 @@ namespace IRaCIS.Core.Domain.Models
[Required]
public bool IsReturnRequired { get; set; }
[Required]
public bool IsUrgent { get; set; }
public bool IsAutoSend { get; set; }
public bool IsEnable { get; set; }
@ -61,14 +98,21 @@ namespace IRaCIS.Core.Domain.Models
public Guid? DeleteUserId { get; set; }
}
[Table("EmailNoticeUserType")]
public class EmailNoticeUserType
{
[JsonIgnore]
public EmailNoticeConfig EmailNoticeConfig { get; set; }
public Guid EmailNoticeConfigId { get; set; }
public UserTypeEnum UserType { get; set; }
public EmailUserType EmailUserType { get; set; }
}
}

43
IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
View File

@ -32,43 +32,32 @@ namespace IRaCIS.Core.Domain.Models
public string FromName { get; set; } = string.Empty;
public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();
//[Required]
//public string ReceiveEmailsStr { get; set; } = string.Empty;
//public string CopyEmailsStr { get; set; } = string.Empty;
//[NotMapped]
//public List<string> ReceiveEmailList => ReceiveEmailsStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=>t.Trim()).ToList();
//[NotMapped]
//public List<string> CopyEmailList => CopyEmailsStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t=> !string.IsNullOrEmpty(t)).Select(t => t.Trim()).ToList();
public string FromEmail { get; set; } = string.Empty;
[Required]
public bool IsUrgent { get; set; }
[Required]
public List<TrialEmailNoticeUser> TrialEmailNoticeUserList { get; set; } = new List<TrialEmailNoticeUser>();
[Required]
public string FilePath { get; set; } = string.Empty;
[Required]
public string FileName { get; set; } = string.Empty;
[Required]
public string Code { get; set; } = string.Empty;
[Required]
public bool IsReturnRequired { get; set; }
[Required]
public bool IsAutoSend { get; set; }
public CommonDocumentBusinessScenario BusinessScenarioEnum { get; set; }
public CriterionType? CriterionTypeEnum { get; set; }
@ -80,12 +69,6 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[Required]
public string FilePath { get; set; } = string.Empty;
[Required]
public string FileName { get; set; } = string.Empty;
[Required]
public Guid CreateUserId { get; set; }

7
IRaCIS.Core.Domain/_Config/_StaticData.cs
View File

@ -83,6 +83,8 @@ public static class StaticData
public static readonly string SystemDataFolder = "SystemData";
public static readonly string OtherDataFolder = "OtherData";
public static readonly string SignDocumentFolder = "SignDocument";
@ -90,6 +92,11 @@ public static class StaticData
public static readonly string EmailHtmlTemplate = "EmailHtml";
public static readonly string CommonFile = "CommonFile";
public static readonly string CheckFile = "CheckFile";
public static readonly string SiteUserSurveryFile = "SiteUserSurveryFile";
public static readonly string NoticeAttachment = "NoticeAttachment";
public static readonly string DicomFolder = "Dicom";