修改中心调研表逻辑

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

@@ -219,26 +219,37 @@ public class SiteSurverRejectedEventConsumer(
 
         var trialId = siteSurveyInfo.TrialId;
 
-
         var messageToSend = new MimeMessage();
 
-        var name = siteSurveyInfo.UserName;
+        var toUserName = siteSurveyInfo.UserName;
 
         if (context.Message.IsHaveSPMOrCPM)
         {
             //PM 驳回到SPM
             if (siteSurveyInfo.State == TrialSiteSurveyEnum.CRCSubmitted)
             {
-                var user = await _userRepository.FirstOrDefaultAsync(t => t.Id == siteSurveyInfo.PreliminaryUserId);
+                //var user = await _userRepository.FirstOrDefaultAsync(t => t.Id == siteSurveyInfo.PreliminaryUserId);
 
-                name = user.FullName;
+                //name = user.FullName;
+
+                var sPMOrCPMList = _trialRepository.Where(t => t.Id == trialId)
+                  .SelectMany(t => t.TrialUserList)
+                  .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM)
+                  .Select(t => new { t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToList();
+
+
+                foreach (var user in sPMOrCPMList)
+                {
+                    messageToSend.To.Add(new MailboxAddress(user.FullName, user.EMail));
+                }
+
+                toUserName = string.Join('、', sPMOrCPMList.Select(t => t.FullName));
 
-                messageToSend.To.Add(new MailboxAddress(name, user.EMail));
             }
             //SPM 驳回到CRC
             else if (siteSurveyInfo.State == TrialSiteSurveyEnum.ToSubmit)
             {
-                messageToSend.To.Add(new MailboxAddress(name, siteSurveyInfo.Email));
+                messageToSend.To.Add(new MailboxAddress(toUserName, siteSurveyInfo.Email));
             }
 
         }
@@ -265,7 +276,7 @@ public class SiteSurverRejectedEventConsumer(
         {
             var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
             var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
-           name,
+           toUserName,
             trialInfo.TrialCode,
                  trialInfo.ResearchProgramNo,
                 trialInfo.ExperimentName,

IRaCIS.Core.Application/MassTransit/Extension/ConsumeExceptionFilter.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using IRaCIS.Core.Domain.BaseModel;
+using IRaCIS.Core.Domain.Share;
+using MassTransit;
+using Microsoft.Extensions.Logging;
+using NPOI.SS.Formula.Functions;
+
+public class ConsumeExceptionFilter<T>(ILogger<ConsumeExceptionFilter<T>> _logger)  : IFilter<ConsumeContext<T>> where T : DomainEvent
+{
+
+    public async Task Send(ConsumeContext<T> context, IPipe<ConsumeContext<T>> next)
+    {
+
+        try
+        {
+            await next.Send(context);
+
+        }
+        catch (Exception exception)
+        {
+            var errorInfo = $"Exception: {exception.Message}[{exception.StackTrace}]" + (exception.InnerException != null ? $" InnerException: {exception.InnerException.Message}[{exception.InnerException.StackTrace}]" : "");
+            _logger.LogError(errorInfo);
+        }
+    }
+
+    public void Probe(ProbeContext context)
+    {
+        context.CreateFilterScope("ConsumeException");
+    }
+}