IRaCIS.Core.API/appsettings.Prod_IRC.json

@@ -9,7 +9,7 @@
   "ConnectionStrings": {
     //"RemoteNew": "Server=10.10.10.49,1434;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
     //"Hangfire": "Server=10.10.10.49,1434;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
-    "RemoteNew": "Server=101.132.193.237,1433;Database=Prod_IRC_pidr_restore_2;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "RemoteNew": "Server=prod_mssql_standard,1433;Database=Prod_IRC;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true",
     "Hangfire": "Server=prod_mssql_standard,1433;Database=Prod_IRC_Hangfire;User ID=sa;Password=zhanying@2021;TrustServerCertificate=true"
   },
   "WeComNoticeConfig": {

IRaCIS.Core.Application/MassTransit/Recurring/SystemDocumentConsumer.cs

@@ -119,7 +119,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                             var htmlBodyStr = string.Format(
                                CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
-                               userinfo.FullName,
+                               userinfo.UserName,
                                      _systemEmailConfig.SiteUrl
                                 );
 
@@ -237,18 +237,29 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                     return;
                 }
 
-                foreach (var userinfo in userinfoList)
+                var userWorkLanguageList = userinfoList.Select(x => x.UserWorkLanguage).Distinct().ToList();
+                foreach (var workLanguage in userWorkLanguageList)
                 {
-                    string msg = $"{userinfo.UserName}生效通知,";
+                    var langUserInfoList = userinfoList.Where(x => x.UserWorkLanguage == workLanguage).ToList();
+                    if (!langUserInfoList.Any())
+                    {
+                        continue;
+                    }
+
+                    string msg = $"{langUserInfoList.Count}生效通知,";
                     try
                     {
                         var messageToSend = new MimeMessage();
                         messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                        messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
 
-                        var workLanguage = userinfo.UserWorkLanguage;
+                        foreach (var userinfo in langUserInfoList)
+                        {
+                            messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                        }
+
                         var userIsEn_US = workLanguage == UserWorkLanguage.US;
                         var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                        var userNames = langUserInfoList.Select(x => x.UserName).ToList();
 
                         Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                         {
@@ -256,7 +267,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                             var htmlBodyStr = string.Format(
                                CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
-                               userinfo.FullName,
+                               string.Join(',', userNames),
                                _systemEmailConfig.SiteUrl
                                 );
 

IRaCIS.Core.Application/MassTransit/Recurring/TrialDocumentConsumer.cs

@@ -148,7 +148,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
 
                             var htmlBodyStr = string.Format(
                                CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
-                               userinfo.FullName,
+                               userinfo.UserName,
                                      _systemEmailConfig.SiteUrl
                                 );
 
@@ -287,26 +287,37 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                                      join u in userinfoList on ut.ConfirmUserId equals u.Id
                                      select new { ut.TrialId, User = u }).ToList();
 
-            foreach (var userWithTrial in userWithTrialList)
+            var groupedList = userWithTrialList.GroupBy(x => new { x.TrialId, x.User.UserWorkLanguage }).ToList();
+            foreach (var groupItem in groupedList)
             {
-                var userinfo = userWithTrial.User;
+                var langUserInfoList = groupItem.Select(x => x.User).Distinct().ToList();
-                string msg = $"{userinfo.UserName}项目生效通知,";
+                if (!langUserInfoList.Any())
+                {
+                    continue;
+                }
+
+                string msg = $"{langUserInfoList.Count}项目生效通知,";
                 try
                 {
                     var messageToSend = new MimeMessage();
                     messageToSend.From.Add(new MailboxAddress(_systemEmailConfig.FromName, _systemEmailConfig.FromEmail));
-                    messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
 
-                    var workLanguage = userinfo.UserWorkLanguage;
+                    foreach (var userinfo in langUserInfoList)
+                    {
+                        messageToSend.To.Add(new MailboxAddress(userinfo.FullName, userinfo.EMail));
+                    }
+
+                    var workLanguage = groupItem.Key.UserWorkLanguage;
                     var userIsEn_US = workLanguage == UserWorkLanguage.US;
                     var companyName = userIsEn_US ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN;
+                    var userNames = langUserInfoList.Select(x => x.UserName).ToList();
                     Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
                     {
                         var topicStr = string.Format(input.topicStr, companyName);
 
                         var htmlBodyStr = string.Format(
                            CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr, workLanguage),
-                           userinfo.FullName,
+                           string.Join(',', userNames),
                            _systemEmailConfig.SiteUrl
                             );
 
@@ -314,7 +325,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
                     };
                     await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(emailConfig, messageToSend, emailConfigFunc, workLanguage);
 
-                    var trialInfo = await _trialRepository.Where(x => x.Id == userWithTrial.TrialId).FirstOrDefaultAsync();
+                    var trialInfo = await _trialRepository.Where(x => x.Id == groupItem.Key.TrialId).FirstOrDefaultAsync();
                     if (trialInfo == null)
                     {
                         continue;