合并

IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs

@@ -14,20 +14,20 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 
 public static class CommonEmailHelper
 {
-    public static async Task<EmailNoticeConfig> GetEmailSubejctAndHtmlInfoAndBuildAsync(IRepository<EmailNoticeConfig> _emailNoticeConfigrepository, EmailBusinessScenario scenario, MimeMessage messageToSend,
-    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc)
+
+    /// <summary>
+    /// 系统默认邮件  + 项目默认邮件  （不用添加到项目邮件配置中，才发送）
+    /// </summary>
+    /// <param name="configInfo"></param>
+    /// <param name="messageToSend"></param>
+    /// <param name="emailFunc"></param>
+    /// <returns></returns>
+    /// <exception cref="BusinessValidationFailedException"></exception>
+    public static async Task<EmailNoticeConfig> GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailNoticeConfig configInfo, MimeMessage messageToSend,
+Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc)
     {
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
-        var configInfo = await _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario).FirstOrDefaultAsync();
-
-        if (configInfo == null)
-        {
-            //"系统未找到当前场景邮件配置信息，请联系运维人员核查"
-            throw new BusinessValidationFailedException(I18n.T("CommonEmail_NotFoundConfig"));
-        }
-
-
         var (topicStr, htmlBodyStr) = isEn_US ? (configInfo.EmailTopic, configInfo.EmailHtmlContent) : (configInfo.EmailTopicCN, configInfo.EmailHtmlContentCN);
 
         try
@@ -54,7 +54,15 @@ public static class CommonEmailHelper
         return configInfo;
     }
 
-    public static async Task<TrialEmailNoticeConfig> GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(TrialEmailNoticeConfig configInfo, EmailBusinessScenario scenario, MimeMessage messageToSend,
+    /// <summary>
+    /// 项目手动邮件  （需要添加到项目邮件配置中，才发送）
+    /// </summary>
+    /// <param name="configInfo"></param>
+    /// <param name="messageToSend"></param>
+    /// <param name="emailFunc"></param>
+    /// <returns></returns>
+    /// <exception cref="BusinessValidationFailedException"></exception>
+    public static async Task<TrialEmailNoticeConfig> GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(TrialEmailNoticeConfig configInfo, MimeMessage messageToSend,
    Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailFunc)
     {
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;

IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs

@@ -99,13 +99,13 @@ public class ImageConsumer(
         }
 
 
-        var trialEmailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        if (emailConfig != null)
         {
             var inDto = new SendImageReuploadEmailInDto
             {
-                EmailNoticeConfig = trialEmailConfig,
+                EmailNoticeConfig = emailConfig,
                 Scenario = scenario,
                 SubjectVisit = subjectVisit,
                 TrialId = trialId,
@@ -143,17 +143,17 @@ public class ImageConsumer(
                 return; // 其他状态不发送邮件
         }
 
-        var trialEmailConfig = _emailNoticeConfigrepository.Where(t =>t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        if (emailConfig != null)
         {
             var inDto = new SendImageReuploadEmailInDto
             {
-                EmailNoticeConfig = trialEmailConfig,
+                EmailNoticeConfig = emailConfig,
                 Scenario = scenario,
                 SubjectVisit = subjectVisit,
                 TrialId = trialId,
-                RequestBackStateEnum= context.Message.RequestBackState,
+                RequestBackStateEnum = context.Message.RequestBackState,
             };
             await SendImageReuploadEmail(inDto);
         }
@@ -185,13 +185,13 @@ public class ImageConsumer(
                 return; // 其他状态不发送邮件
         }
 
-        var trialEmailConfig = _emailNoticeConfigrepository.Where(t =>t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        if (emailConfig != null)
         {
             var inDto = new SendImageReuploadEmailInDto
             {
-                EmailNoticeConfig = trialEmailConfig,
+                EmailNoticeConfig = emailConfig,
                 Scenario = scenario,
                 SubjectVisit = subjectVisit,
                 TrialId = trialId
@@ -210,13 +210,13 @@ public class ImageConsumer(
 
         var visitTaskId = context.Message.VisitTaskId;
         // 获取VisitTask关联的SubjectVisit
-        var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x => x.Subject).Include(x=>x.SourceSubjectVisit).FirstNotNullAsync();
+        var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x => x.Subject).Include(x => x.SourceSubjectVisit).FirstNotNullAsync();
         var subjectVisit = new SubjectVisit() { };
         if (visitTask.SourceSubjectVisitId != null)
         {
             subjectVisit = visitTask.SourceSubjectVisit;
         }
-        else if(visitTask.SouceReadModuleId!=null)
+        else if (visitTask.SouceReadModuleId != null)
         {
             var readModule = await _readModuleRepository.Where(x => x.Id == visitTask.SouceReadModuleId).Include(x => x.SubjectVisit).FirstOrDefaultAsync();
             subjectVisit = readModule.SubjectVisit;
@@ -238,13 +238,14 @@ public class ImageConsumer(
             default:
                 return; // 其他状态不发送邮件
         }
-        var trialEmailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
+
+        if (emailConfig != null)
         {
             var inDto = new SendImageReuploadEmailInDto
             {
-                EmailNoticeConfig = trialEmailConfig,
+                EmailNoticeConfig = emailConfig,
                 Scenario = scenario,
                 SubjectVisit = subjectVisit,
                 TrialId = trialId
@@ -272,15 +273,15 @@ public class ImageConsumer(
         List<UserRole> ccUserList = new List<UserRole>();
 
         var emailNoticeUserList = await _emailNoticeUserTypeRepository.Where(x => x.EmailNoticeConfigId == inDto.EmailNoticeConfig.Id).ToListAsync();
-        var userTypeEnum= emailNoticeUserList.Select(x => x.UserType).ToList();
+        var userTypeEnum = emailNoticeUserList.Select(x => x.UserType).ToList();
         if (inDto.UserTypes != null)
         {
             userTypeEnum = inDto.UserTypes;
         }
-        var crcUserList =new  List<UserRole>(){ };
+        var crcUserList = new List<UserRole>() { };
         if (userTypeEnum.Contains(UserTypeEnum.ClinicalResearchCoordinator))
         {
-            crcUserList=await _trialSiteRepository.Where(x=>x.Id== inDto.SubjectVisit.TrialSiteId).SelectMany(x=>x.CRCUserList.Select(y => y.UserRole)).ToListAsync();
+            crcUserList = await _trialSiteRepository.Where(x => x.Id == inDto.SubjectVisit.TrialSiteId).SelectMany(x => x.CRCUserList.Select(y => y.UserRole)).ToListAsync();
         }
 
         if (inDto.UserTypes == null)
@@ -307,7 +308,7 @@ public class ImageConsumer(
         }
 
 
-         var ccList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.Copy && x.UserType != UserTypeEnum.ClinicalResearchCoordinator).Select(x => x.UserType).ToList();
+        var ccList = emailNoticeUserList.Where(x => x.EmailUserType == EmailUserType.Copy && x.UserType != UserTypeEnum.ClinicalResearchCoordinator).Select(x => x.UserType).ToList();
 
         ccUserList = trialUser.Where(x => ccList.Contains(x.UserTypeEnum)).ToList();
 
@@ -375,7 +376,7 @@ public class ImageConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, inDto.Scenario, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(inDto.EmailNoticeConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -404,11 +405,11 @@ public class ImageConsumer(
         // 设置邮件场景
         var scenario = EmailBusinessScenario.ReviewerSelection_PMApplyApproving; // 69
 
-        var trialEmailConfig = _emailNoticeConfigrepository.Where(t =>t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        if (emailConfig != null)
         {
-            await SendReviewerSelectionEmail(trialEmailConfig, scenario, trialId, enrollIdList);
+            await SendReviewerSelectionEmail(emailConfig, trialId, enrollIdList);
         }
     }
 
@@ -435,18 +436,18 @@ public class ImageConsumer(
         // 设置邮件场景
         var scenario = EmailBusinessScenario.ReviewerSelection_SPMCPMApproval; // 70
 
-        var trialEmailConfig = _emailNoticeConfigrepository.Where(t =>t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable && t.IsAutoSend).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        if (emailConfig != null)
         {
-            await SendReviewerSelectionEmail(trialEmailConfig, scenario, trialId, enrollIdList);
+            await SendReviewerSelectionEmail(emailConfig,  trialId, enrollIdList);
         }
     }
 
     /// <summary>
     /// 发送阅片人筛选相关邮件的通用方法
     /// </summary>
-    private async Task SendReviewerSelectionEmail(EmailNoticeConfig emailNoticeConfig, EmailBusinessScenario scenario, Guid trialId, List<Guid> enrollIdList)
+    private async Task SendReviewerSelectionEmail(EmailNoticeConfig emailNoticeConfig, Guid trialId, List<Guid> enrollIdList)
     {
         var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
 
@@ -454,7 +455,7 @@ public class ImageConsumer(
         var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);
 
         // 根据不同场景获取不同角色的用户
-        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == trialId &&!x.TrialUser.IsDeleted).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == trialId && !x.TrialUser.IsDeleted).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();
 
         // 根据场景确定收件人
         List<UserRole> toUserList = new List<UserRole>();
@@ -508,7 +509,7 @@ public class ImageConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailNoticeConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }

IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs

@@ -126,7 +126,7 @@ public class UrgentMedicalReviewAddedEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
@@ -234,7 +234,7 @@ public class UrgentIRRepliedMedicalReviewConsumer(
 
                 return (topicStr, htmlBodyStr);
             };
-             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -352,7 +352,7 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -461,7 +461,7 @@ public class UrgentIRApplyedReReadingConsumer(
                     return (topicStr, htmlBodyStr);
                 };
 
-                 await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+                 await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }

IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs

@@ -120,7 +120,7 @@ public class UserSiteSurveySubmitedEventConsumer(
             };
 
 
-             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -191,19 +191,19 @@ public class SiteSurveySPMSubmitedEventConsumer(
                 var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
                 var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                 toUserName,
-                siteInfo.TrialSiteCode,
-                siteInfo.TrialSiteAliasName,
+                siteInfo.TrialSiteCode,  //中心编号
+                siteInfo.TrialSiteAliasName,//中心名称
 
-               siteSurveyInfo.UserName,
-               siteSurveyInfo.Email,
-               siteSurveyInfo.Phone,
-               _systemEmailConfig.SiteUrl
+               siteSurveyInfo.UserName, //联系人
+               siteSurveyInfo.Email,  //联系邮箱
+               siteSurveyInfo.Phone,  //联系电话
+               _systemEmailConfig.SiteUrl 
                     );
 
                 return (topicStr, htmlBodyStr);
             };
 
-             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -234,7 +234,7 @@ public class SiteSurverRejectedEventConsumer(
 
         var trialSiteSurveyId = context.Message.TrialSiteSurveyId;
 
-        var siteSurveyInfo = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId).FirstOrDefault().IfNullThrowException();
+        var siteSurveyInfo = _trialSiteSurveyRepository.Where(t => t.Id == trialSiteSurveyId ,ignoreQueryFilters:true).FirstOrDefault().IfNullThrowException();
 
         var trialId = siteSurveyInfo.TrialId;
 
@@ -304,19 +304,20 @@ public class SiteSurverRejectedEventConsumer(
                 var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
                toUserName,
                 trialInfo.TrialCode,
-                     trialInfo.ResearchProgramNo,
-                    trialInfo.ExperimentName,
-                siteInfo.TrialSiteCode,
-                siteInfo.TrialSiteAliasName,
-                   siteSurveyInfo.LatestBackReason,
-                _systemEmailConfig.SiteUrl,
+                trialInfo.ResearchProgramNo,
+                trialInfo.ExperimentName,
+
+                siteInfo.TrialSiteCode,  //中心编号
+                siteInfo.TrialSiteAliasName,//中心名称
+                siteSurveyInfo.LatestBackReason,  //驳回原因
+                _systemEmailConfig.SiteUrl,  //链接
                    (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit ? "inline - block" : "none")
                     );
 
                 return (topicStr, htmlBodyStr);
             };
 
-            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }

IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs

@@ -120,7 +120,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -219,7 +219,7 @@ public class CRCRepliedQCChallengeEventConsumer(
 
                 return (topicStr, htmlBodyStr);
             };
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -337,7 +337,7 @@ public class QCRepliedQCChallengeEventConsumer(
                 };
 
 
-                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
@@ -437,7 +437,7 @@ public class CRCRepliedCheckChallengeEventConsumer(
                 };
 
 
-                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
@@ -547,7 +547,7 @@ public class PMRepliedCheckChallengeEventConsumer(
                 };
 
 
-                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
@@ -646,7 +646,7 @@ public class CheckStateChangedToAuditEventConsumer(
                 };
 
 
-                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+                await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                 await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
             }
@@ -755,7 +755,7 @@ public class QCClaimTaskEventConsumer(
             };
 
 
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }

IRaCIS.Core.Application/MassTransit/Recurring/IRRecurringConsumer.cs

@@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                             return (topicStr, htmlBodyStr);
                         };
 
-                         await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+                         await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, messageToSend, emailConfigFunc);
 
                         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 

IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs

@@ -71,14 +71,14 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 IsNeedSendEmial = identityUser.IsZhiZhun || (!identityUser.IsZhiZhun && sysDoc.DocUserSignType == DocUserSignType.InnerAndOuter),
                 FullFilePath = sysDoc.Path
             };
-            var datalist = await systemDocQuery.IgnoreQueryFilters().Where(t => t.IsDeleted==false && t.ConfirmTime == null)
+            var datalist = await systemDocQuery.IgnoreQueryFilters().Where(t => t.IsDeleted == false && t.ConfirmTime == null)
              .ToListAsync();
             datalist = datalist.Where(x => x.SuggestFinishTime != null && x.SuggestFinishTime.Value.Date == DateTime.Now.Date)
                 .Where(x => x.IsNeedSendEmial).ToList();
             var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
             var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
 
-            Console.WriteLine("发送定时过期提醒:人员数量"+ userinfoList.Count);
+            Console.WriteLine("发送定时过期提醒:人员数量" + userinfoList.Count);
             int index = 1;
             foreach (var userinfo in userinfoList)
             {
@@ -107,19 +107,24 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                         return (topicStr, htmlBodyStr);
                     };
 
-                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+                    var scenario = EmailBusinessScenario.GeneralTraining_ExpirationNotification;
 
-                        EmailBusinessScenario.GeneralTraining_ExpirationNotification,
+                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+                    if (emailConfig != null)
+                    {
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                    }
 
-                        messageToSend, emailConfigFunc);
 
-                    await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
                 }
                 catch (Exception)
                 {
 
                 }
-               
+
             }
 
 
@@ -149,7 +154,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
             var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
             var systemDocQuery =
             from sysDoc in _systemDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
-            from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.Status == UserStateEnum.Enable&& t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+            from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.Status == UserStateEnum.Enable && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
             select new UnionDocumentWithConfirmInfoView()
             {
                 IsSystemDoc = true,
@@ -165,23 +170,23 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                 RealName = identityUser.FullName,
                 UserName = identityUser.UserName,
-                IsNeedSendEmial= identityUser.IsZhiZhun || (!identityUser.IsZhiZhun&& sysDoc.DocUserSignType== DocUserSignType.InnerAndOuter),
+                IsNeedSendEmial = identityUser.IsZhiZhun || (!identityUser.IsZhiZhun && sysDoc.DocUserSignType == DocUserSignType.InnerAndOuter),
 
 
                 FullFilePath = sysDoc.Path
             };
-            var datalist = await systemDocQuery.IgnoreQueryFilters().Where(x=>x.IsNeedSendEmial).ToListAsync();
+            var datalist = await systemDocQuery.IgnoreQueryFilters().Where(x => x.IsNeedSendEmial).ToListAsync();
 
             var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
             var userinfoList = await _identityUserRepository.Where(x => confirmUserIdList.Contains(x.Id)).ToListAsync();
-            int index= 1;
+            int index = 1;
             foreach (var userinfo in userinfoList)
             {
                 string msg = $"{index}生效通知,邮箱：{userinfo.EMail}，姓名{userinfo.UserName},";
                 index++;
                 try
                 {
-                   
+
                     var messageToSend = new MimeMessage();
                     //发件地址
                     messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
@@ -203,14 +208,19 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                         return (topicStr, htmlBodyStr);
                     };
 
-                    await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository,
+                    var scenario = EmailBusinessScenario.GeneralTraining_EffectiveNotification;
 
-                        EmailBusinessScenario.GeneralTraining_EffectiveNotification,
+                    var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+
+                    if (emailConfig != null)
+                    {
+                        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
+
+                        await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
+                        msg += "发送成功";
+                    }
 
-                        messageToSend, emailConfigFunc);
 
-                    await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
-                    msg += "发送成功";
                 }
                 catch (Exception)
                 {