From 5e193db33b7e2322c969499de0b4bec88fe37b7e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 7 May 2025 13:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BF=83=E8=B0=83?=
 =?UTF-8?q?=E7=A0=94=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Consumer/SiteSurverEmailConsumer.cs       | 26 +++++++++----------
 .../Common/EmailScenarioEnum.cs               |  3 +++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
index a72aa31f4..8fd86858f 100644
--- a/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
@@ -25,14 +25,14 @@ using System.Threading.Tasks;
 namespace IRaCIS.Core.Application.MassTransit.Consumer;
 
 /// <summary>
-/// 用户提交 发送邮件 通知SPM 或者PM
+/// 用户提交 发送邮件 通知SPM 或者PM   项目默认邮件，不用添加到项目中，直接发送的
 /// </summary>
 public class UserSiteSurveySubmitedEventConsumer(
       IRepository<Trial> _trialRepository,
       IRepository<TrialSite> _trialSiteRepository,
        IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
-      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
+      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
     ) : IConsumer<UserSiteSurveySubmitedEvent>
 {
@@ -51,9 +51,9 @@ public class UserSiteSurveySubmitedEventConsumer(
         EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
 
-        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        if (emailConfig != null)
         {
 
             var trialUserList = await _trialUserRoleRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId && t.TrialUser.IsDeleted == false)
@@ -120,7 +120,7 @@ public class UserSiteSurveySubmitedEventConsumer(
             };
 
 
-             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -136,7 +136,7 @@ public class SiteSurveySPMSubmitedEventConsumer(
       IRepository<TrialUserRole> _trialUserRoleRepository,
       IRepository<TrialSite> _trialSiteRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
-      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
+      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<SiteSurveySPMSubmitedEvent>
 {
     private readonly SystemEmailSendConfig _systemEmailConfig = systemEmailConfig.CurrentValue;
@@ -153,9 +153,9 @@ public class SiteSurveySPMSubmitedEventConsumer(
 
         var scenario = EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
-        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        if (emailConfig != null)
         {
             var messageToSend = new MimeMessage();
 
@@ -203,7 +203,7 @@ public class SiteSurveySPMSubmitedEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-             await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+             await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
@@ -222,7 +222,7 @@ public class SiteSurverRejectedEventConsumer(
       IRepository<Trial> _trialRepository,
       IRepository<TrialSite> _trialSiteRepository,
       IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
-     IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigrepository,
+     IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
       IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
     ) : IConsumer<SiteSurverRejectedEvent>
 {
@@ -240,9 +240,9 @@ public class SiteSurverRejectedEventConsumer(
 
         var scenario = EmailBusinessScenario.SiteSurveyReject;
 
-        var trialEmailConfig = _trialEmailNoticeConfigrepository.Where(t => t.TrialId == trialId && t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
+        var emailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsAutoSend && t.IsEnable).FirstOrDefault();
 
-        if (trialEmailConfig != null)
+        if (emailConfig != null)
         {
            
 
@@ -316,7 +316,7 @@ public class SiteSurverRejectedEventConsumer(
                 return (topicStr, htmlBodyStr);
             };
 
-            await CommonEmailHelper.GetTrialEmailSubejctAndHtmlInfoAndBuildAsync(trialEmailConfig, scenario, messageToSend, emailConfigFunc);
+            await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
 
             await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
         }
diff --git a/IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs b/IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs
index 26bbf8344..fc81f3708 100644
--- a/IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Common/EmailScenarioEnum.cs
@@ -89,10 +89,13 @@ namespace IRaCIS.Core.Domain.Share
         //不登陆通过邮箱重置密码
         UnloginUseEmailResetPassword = 23,
 
+        //影像异常反馈
         IRImageError=24,
 
+        //系统反馈
         SysFeedBack=26,
 
+        //项目反馈
         TrialFeedBack=27,
 
         TrialSubjectVisitFeedBack = 28,