项目邮件配置修改--007

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -552,7 +552,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.SyncSystemEmainCofigDocListAsync(System.Guid)">
             <summary>
-            同步系统配置的文档到想项目中
+            同步系统配置的文档到想项目中 ---废弃
             </summary>
             <param name="trialId"></param>
             <returns></returns>
@@ -8070,6 +8070,27 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit">
             <summary> TrialEmailNoticeConfigAddOrEdit  列表查询参数模型</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit.BusinessModuleEnum">
+            <summary> 业务模块 /// </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit.BusinessLevelEnum">
+            <summary> 业务层级 /// </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit.EmailTypeEnum">
+            <summary> 邮件类型 /// </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit.EmailUrgentEnum">
+            <summary> 邮件加急类型 /// </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit.EmailCron">
+            <summary> 定时周期 /// </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit.EmailTopic">
+            <summary> 邮件主题 /// </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit.AttachPath">
+            <summary> 附件 /// </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.SystemAnonymizationView">
             <summary> SystemAnonymizationView  列表视图模型 </summary>
         </member>

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<UserTypeEnum>? ToUserTypeList { get; set; }
+        public List<UserTypeEnum> ToUserTypeList { get; set; }
         public List<UserTypeEnum> 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;
+
+
+
+        /// <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 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;
 
 
     }

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
         /// <summary>
-        /// 同步系统配置的文档到想项目中
+        /// 同步系统配置的文档到想项目中 ---废弃
         /// </summary>
         /// <param name="trialId"></param>
         /// <returns></returns>
@@ -158,8 +158,8 @@ namespace IRaCIS.Core.Application.Service
                         {
                             TrialId = trialId,
                             TrialReadingCriterionId = list.Where(t => t.CriterionType == item.CriterionTypeEnum).FirstOrDefault()?.TrialReadingCriterionId,
-                            FileName = item.Name,
+                            //FileName = item.Name,
-                            FilePath = item.Path,
+                            //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<List<TrialEmailNoticeConfigView>> 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)

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; }
 
 
 

IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs

@@ -40,14 +40,6 @@ namespace IRaCIS.Core.Domain.Models
         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;
-
-
-
 
 
         /// <summary> 业务模块 /// </summary>

IRaCIS.Core.Domain/SQLFile/20220808.sql

@@ -1,2 +1,6 @@
 
-update TrialSiteUserSurvey  set TrialRoleCode= (select Code from Dictionary where Id=TrialSiteUserSurvey.TrialRoleNameId)
+--中心调研维护
+update TrialSiteUserSurvey  set TrialRoleCode= (select Code from Dictionary where Id=TrialSiteUserSurvey.TrialRoleNameId)
+
+--邮件发送维护
+update TrialEmailNoticeConfig set AttachCNPath=FilePath,AttachPath=FilePath,AttachNameCN=FileName,AttachName=FileName