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;
///
-/// 用户提交 发送邮件 通知SPM 或者PM
+/// 用户提交 发送邮件 通知SPM 或者PM 项目默认邮件,不用添加到项目中,直接发送的
///
public class UserSiteSurveySubmitedEventConsumer(
IRepository _trialRepository,
IRepository _trialSiteRepository,
IRepository _trialUserRoleRepository,
IRepository _trialSiteSurveyRepository,
- IRepository _trialEmailNoticeConfigrepository,
+ IRepository _emailNoticeConfigrepository,
IOptionsMonitor systemEmailConfig
) : IConsumer
{
@@ -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 _trialUserRoleRepository,
IRepository _trialSiteRepository,
IRepository _trialSiteSurveyRepository,
- IRepository _trialEmailNoticeConfigrepository,
+ IRepository _emailNoticeConfigrepository,
IOptionsMonitor systemEmailConfig) : IConsumer
{
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 _trialRepository,
IRepository _trialSiteRepository,
IRepository _trialSiteSurveyRepository,
- IRepository _trialEmailNoticeConfigrepository,
+ IRepository _emailNoticeConfigrepository,
IOptionsMonitor systemEmailConfig
) : IConsumer
{
@@ -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,