From e46b51d6a121d664bca337b5044b1c90e63939e1 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 21 Aug 2023 16:15:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=AE=E4=BB=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9--007?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 23 +++++++++- .../DTO/TrialEmailNoticeConfigViewModel.cs | 42 +++++++++++++++++-- .../Document/TrialEmailNoticeConfigService.cs | 14 +++---- .../Common/EmailNoticeConfig.cs | 7 ++-- .../Document/TrialEmailNoticeConfig.cs | 8 ---- IRaCIS.Core.Domain/SQLFile/20220808.sql | 6 ++- 6 files changed, 76 insertions(+), 24 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 3fb61831b..fb325ce8e 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -552,7 +552,7 @@ - 同步系统配置的文档到想项目中 + 同步系统配置的文档到想项目中 ---废弃 @@ -8070,6 +8070,27 @@ TrialEmailNoticeConfigAddOrEdit 列表查询参数模型 + + 业务模块 /// + + + 业务层级 /// + + + 邮件类型 /// + + + 邮件加急类型 /// + + + 定时周期 /// + + + 邮件主题 /// + + + 附件 /// + SystemAnonymizationView 列表视图模型 diff --git a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs index 8ecdc76e8..e40d5716d 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/TrialEmailNoticeConfigViewModel.cs @@ -146,7 +146,7 @@ namespace IRaCIS.Core.Application.ViewModel public string FromEmail { get; set; } = string.Empty; - public List? ToUserTypeList { get; set; } + public List ToUserTypeList { get; set; } public List CopyUserTypeList { get; set; } @@ -158,8 +158,44 @@ namespace IRaCIS.Core.Application.ViewModel public bool IsReturnRequired { get; set; } - public string FilePath { get; set; } = string.Empty; - public string FileName { get; set; } = string.Empty; + + + + + /// 业务模块 /// + public int BusinessModuleEnum { get; set; } + + /// 业务层级 /// + public int BusinessLevelEnum { get; set; } + + /// 邮件类型 /// + public int EmailTypeEnum { get; set; } + + /// 邮件加急类型 /// + public int EmailUrgentEnum { get; set; } + + /// 定时周期 /// + public string EmailCron { get; set; } = string.Empty; + + /// 邮件主题 /// + 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 Description { get; set; } = string.Empty; + + + public string AttachName { get; set; } + public string AttachNameCN { get; set; } + + + public string EmailHtmlContent { get; set; } = string.Empty; + public string EmailHtmlContentCN { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 123865327..12b5fd01e 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service } /// - /// 同步系统配置的文档到想项目中 + /// 同步系统配置的文档到想项目中 ---废弃 /// /// /// @@ -158,8 +158,8 @@ namespace IRaCIS.Core.Application.Service { TrialId = trialId, TrialReadingCriterionId = list.Where(t => t.CriterionType == item.CriterionTypeEnum).FirstOrDefault()?.TrialReadingCriterionId, - FileName = item.Name, - FilePath = item.Path, + //FileName = item.Name, + //FilePath = item.Path, BusinessScenarioEnum = item.BusinessScenarioEnum, Code = item.Code }); @@ -580,7 +580,7 @@ namespace IRaCIS.Core.Application.Service #region 确保 邮件Html存在 //邮件附件 - var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, emailConfig.FilePath); + var path = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, _userInfo.IsEn_Us ? emailConfig.AttachPath : emailConfig.AttachCNPath); if (!File.Exists(path)) { @@ -950,7 +950,7 @@ namespace IRaCIS.Core.Application.Service //先预先生成了邮件，发送预先生成的邮件 sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig() { - FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(emailConfig.FileName)}.pdf", + FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension( _userInfo.IsEn_Us? emailConfig.AttachName: emailConfig.AttachNameCN)}.pdf", FileStream = File.OpenRead(phyPath), }); @@ -1018,7 +1018,7 @@ namespace IRaCIS.Core.Application.Service sendEmailConfig.EmailAttachMentConfigList.Add(new EmailAttachMentConfig() { - FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(emailConfig.FileName)}.pdf", + FileName = $"{taskInfo.SubjectCode}_{Path.GetFileNameWithoutExtension(_userInfo.IsEn_Us ? emailConfig.AttachName : emailConfig.AttachNameCN)}.pdf", FileStream = pdfMemoryStream }); @@ -1506,7 +1506,7 @@ namespace IRaCIS.Core.Application.Service [HttpPost] public async Task> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery) { - await SyncSystemEmainCofigDocListAsync(inQuery.TrialId); + //await SyncSystemEmainCofigDocListAsync(inQuery.TrialId); var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId) .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.TrialReadingCriterionId == null) diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs index f7f26639d..08b95ac22 100644 --- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs @@ -52,17 +52,16 @@ namespace IRaCIS.Core.Domain.Models public string AttachCNPath { get; set; } = string.Empty; - public string EmailHtmlContentPath { get; set; } = string.Empty; + public string EmailHtmlContent { get; set; } = string.Empty; - public string EmailHtmlContentCNPath { get; set; } = string.Empty; + public string EmailHtmlContentCN { 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; } + diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs index 996d92800..0fe9cbf93 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs @@ -40,14 +40,6 @@ namespace IRaCIS.Core.Domain.Models public List TrialEmailNoticeUserList { get; set; } = new List(); - [Required] - public string FilePath { get; set; } = string.Empty; - - [Required] - public string FileName { get; set; } = string.Empty; - - - /// 业务模块 /// diff --git a/IRaCIS.Core.Domain/SQLFile/20220808.sql b/IRaCIS.Core.Domain/SQLFile/20220808.sql index 639ad02c0..c78dc0968 100644 --- a/IRaCIS.Core.Domain/SQLFile/20220808.sql +++ b/IRaCIS.Core.Domain/SQLFile/20220808.sql @@ -1,2 +1,6 @@  -update TrialSiteUserSurvey set TrialRoleCode= (select Code from Dictionary where Id=TrialSiteUserSurvey.TrialRoleNameId) \ No newline at end of file +--中心调研维护 +update TrialSiteUserSurvey set TrialRoleCode= (select Code from Dictionary where Id=TrialSiteUserSurvey.TrialRoleNameId) + +--邮件发送维护 +update TrialEmailNoticeConfig set AttachCNPath=FilePath,AttachPath=FilePath,AttachNameCN=FileName,AttachName=FileName \ No newline at end of file