From de29bd7d1526f62ac0d179c72422df3964e20fb8 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 5 Jan 2026 10:00:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MassTransit/Consumer/ImageConsumer.cs | 4 ++-- .../Recurring/OldRecurringEmailHelper.cs | 2 +- .../MassTransit/Recurring/TrialDocumentConsumer.cs | 4 +++- .../Service/Common/MailService.cs | 14 ++++++++++++-- .../Common/EmailScenarioEnum.cs | 2 +- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs index 0b012a76e..f45d703d5 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs @@ -256,7 +256,7 @@ public class ImageConsumer( } /// - /// 发送影像重传相关邮件的通用方法 + /// 发送影像重传相关邮件的通用方法 已经处理项目 /// private async Task SendImageReuploadEmail(SendImageReuploadEmailInDto inDto) { @@ -436,7 +436,7 @@ public class ImageConsumer( } /// - /// 发送阅片人筛选相关邮件的通用方法 + /// 发送阅片人筛选相关邮件的通用方法 已经处理项目 /// private async Task SendReviewerSelectionEmail(EmailNoticeConfig emailNoticeConfig, Guid trialId, List enrollIdList) { diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs b/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs index 8055c2c3a..6f9463e01 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs @@ -18,7 +18,7 @@ public static class OldRecurringEmailHelper public static string EmailNamePlaceholder => StaticData.EmailSend.EmailNamePlaceholder; - + //发送项目邮件的通用方法 已经处理 public static async Task SendTrialEmailAsync( IRepository _trialEmailNoticeConfigRepository, IRepository _trialRepository, diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs index 5f4fd1cb6..68978d9de 100644 --- a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs @@ -76,6 +76,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring CurrentStaffTrainDays = trialDoc.CurrentStaffTrainDays, NewStaffTrainDays = trialDoc.NewStaffTrainDays, Id = trialDoc.Id, + TrialId= trialDoc.TrialId, IsSystemDoc = false, CreateTime = trialDoc.CreateTime, FullFilePath = trialDoc.Path, @@ -110,6 +111,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring { Console.WriteLine($"{index}发送定时过期提醒,邮箱：{userinfo.EMail}，姓名{userinfo.UserName}"); index++; + var trialInfo = _trialRepository.Where(x => x.Id == userinfo.TrialId).FirstOrDefault(); var messageToSend = new MimeMessage(); //发件地址 messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail)); @@ -139,7 +141,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring { await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc); - await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig); + await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo); } diff --git a/IRaCIS.Core.Application/Service/Common/MailService.cs b/IRaCIS.Core.Application/Service/Common/MailService.cs index 86d56f9cd..82c04cefc 100644 --- a/IRaCIS.Core.Application/Service/Common/MailService.cs +++ b/IRaCIS.Core.Application/Service/Common/MailService.cs @@ -315,7 +315,7 @@ namespace IRaCIS.Core.Application.Service var sucessHandle = GetEmailSuccessHandle(Guid.Empty, verificationCode, emailAddress); - await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig, sucessHandle); + await SendEmailHelper.SendEmailAsync(messageToSend, trialInfo, sucessHandle); } @@ -750,6 +750,8 @@ namespace IRaCIS.Core.Application.Service var isHaveTrialId = feedBack.TrialId != null; + var trialinfo = await _trialRepository.Where(x => x.Id == feedBack.TrialId).FirstOrDefaultAsync(); + var companyName = _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN; var emialScenario = feedBack.VisitTaskId != null ? EmailBusinessScenario.IRImageError : (feedBack.SubjectVisitId != null ? EmailBusinessScenario.TrialSubjectVisitFeedBack : (feedBack.TrialId != null ? EmailBusinessScenario.TrialFeedBack : EmailBusinessScenario.SysFeedBack)); @@ -884,7 +886,15 @@ namespace IRaCIS.Core.Application.Service await GetEmailSubejctAndHtmlInfoAndBuildAsync(EmailBusinessScenario.SysFeedBack, messageToSend, emailConfigFunc); } - await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig); + if (trialinfo == null) + { + await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig); + } + else + { + await SendEmailHelper.SendEmailAsync(messageToSend, trialinfo); + } + } diff --git a/IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs b/IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs index d3fbdffad..857c1c5c1 100644 --- a/IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs +++ b/IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs @@ -137,7 +137,7 @@ namespace IRaCIS.Core.Domain.Share Approval_UpdateSiteSurvey = 35, /// - /// 中心调研审批 + /// 中心调研审批 ---- 这个没找到引用 /// SiteSurveyApproval = 36,