From 4955a24d6f65f3a32f044f8dcbe78eb003bfdfd7 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 1 Dec 2025 10:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MassTransit/Recurring/QCRecurringEmailConsumer.cs  |  2 +-
 .../MassTransit/Recurring/TrialDocumentConsumer.cs     | 10 +++++++++-
 .../Service/Document/DTO/SystemDocumentViewModel.cs    |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/QCRecurringEmailConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/QCRecurringEmailConsumer.cs
index d2b39f2dc..8d40ffcc0 100644
--- a/IRaCIS.Core.Application/MassTransit/Recurring/QCRecurringEmailConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Recurring/QCRecurringEmailConsumer.cs
@@ -201,7 +201,7 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
                 {
                     var topicStr = string.Format(isEn_us ? trialEmailConfig.EmailTopic : trialEmailConfig.EmailTopicCN, trialInfo.ResearchProgramNo);
                     var htmlBodyStr = string.Format(isEn_us ? trialEmailConfig.EmailHtmlContent : trialEmailConfig.EmailHtmlContentCN,
-                        user.FullName, DateTime.Now, sendStat.ToBeClaimedCount, sendStat.ToBeReviewedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
+                        user.FullName, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), sendStat.ToBeClaimedCount, sendStat.ToBeReviewedCount, _SystemEmailSendConfig.CurrentValue.SiteUrl);
 
                     return (topicStr, htmlBodyStr, false, userId);
                 };
diff --git a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs
index 92680fd87..c0633d855 100644
--- a/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs
@@ -162,6 +162,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
      IRepository<VisitTask> _visitTaskRepository,
         IRepository<TrialDocument> _trialDocumentRepository,
           IRepository<IdentityUser> _identityUserRepository,
+               IRepository<Trial> _trialRepository,
               IRepository<TrialIdentityUser> _trialIdentityUserRepository,
       IRepository<Dictionary> _dictionaryRepository,
      IRepository<TrialUserRole> _trialUserRoleRepository,
@@ -219,7 +220,9 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 from trialDoc in _trialDocumentRepository.AsQueryable(false).Where(x => context.Message.Ids.Contains(x.Id))
                 join trialIdentityUser in _trialIdentityUserRepository.Where(x => x.IsDeleted == false) on trialDoc.TrialId equals trialIdentityUser.TrialId
                 join trialUserRole in _trialUserRoleRepository.Where(x=>x.IsDeleted==false) on trialIdentityUser.Id equals trialUserRole.TrialUserId
-                join identityUser in _identityUserRepository.AsQueryable(false).Where(u => u.Status == UserStateEnum.Enable)   
+
+                join trial in _trialRepository.AsQueryable(false) on trialDoc.TrialId equals trial.Id
+                join identityUser in _identityUserRepository.AsQueryable(false).Where(u => u.Status == UserStateEnum.Enable)
                  on trialIdentityUser.IdentityUserId equals identityUser.Id
                 where trialIdentityUser.TrialUserRoleList.Any(ur => !ur.IsDeleted &&trialDoc.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == ur.UserRole.UserTypeId))
 
@@ -228,6 +231,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                 {
                     IsSystemDoc = false,
                     Id = trialDoc.Id,
+                    EmailFromName=trial.EmailFromName,
                     CreateTime = trialDoc.CreateTime,
                     IsDeleted = trialDoc.IsDeleted,
                     SignViewMinimumMinutes = trialDoc.SignViewMinimumMinutes,
@@ -242,6 +246,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                     FullFilePath = trialDoc.Path
                 };
             }
+
             var datalist = await systemDocQuery.IgnoreQueryFilters().ToListAsync();
 
             var confirmUserIdList = datalist.Select(t => t.ConfirmUserId).Distinct().ToList();
@@ -283,6 +288,9 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                     {
                         await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc);
 
+                        var trial = datalist.Where(x => x.ConfirmUserId == userinfo.Id).FirstOrDefault();
+
+                        SendEmailHelper.ChangeEmailSenderName(messageToSend, trial.EmailFromName);
                         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
                         msg += "发送成功";
                     }
diff --git a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
index dd2a41d35..e4a1da67c 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
@@ -96,7 +96,7 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsNeedSendEmial { get; set; }
         public DateTime UserCreateTime { get; set; }
 
-
+        public string EmailFromName { get; set; }
 
         public DateTime? ConfirmTime { get; set; }