Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -113,7 +113,7 @@ public class UserSiteSurveySubmitedEventConsumer(
         var scenario = _trialSiteSurveyRepository.Any(t => t.Id != trialSiteSurveyId && t.TrialId == siteSurveyInfo.TrialId && t.TrialSiteId == siteSurveyInfo.TrialSiteId) ?
           EmailBusinessScenario.Approval_UpdateSiteSurvey : EmailBusinessScenario.Approval_SubmitSiteSurvey;
 
-        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, EmailBusinessScenario.Approval_SubmitSiteSurvey, messageToSend, emailConfigFunc);
+        await CommonEmailHelper.GetEmailSubejctAndHtmlInfoAndBuildAsync(_emailNoticeConfigrepository, scenario, messageToSend, emailConfigFunc);
 
         await SendEmailHelper.SendEmailAsync(messageToSend, _systemEmailConfig);
 
@@ -174,7 +174,7 @@ public class SiteSurveySPMSubmitedEventConsumer(
 
         Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
         {
-            var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
             var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
             toUserName,
             siteInfo.TrialSiteCode,
@@ -274,7 +274,7 @@ public class SiteSurverRejectedEventConsumer(
 
         Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr)> emailConfigFunc = input =>
         {
-            var topicStr = string.Format(input.topicStr, companyName, trialInfo.ResearchProgramNo);
+            var topicStr = string.Format(input.topicStr, trialInfo.ResearchProgramNo);
             var htmlBodyStr = string.Format(CommonEmailHelper.ReplaceCompanyName(_systemEmailConfig, input.htmlBodyStr),
            toUserName,
             trialInfo.TrialCode,

IRaCIS.Core.Application/Service/Common/DTO/EmailNoticeConfigViewModel.cs

@@ -72,7 +72,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public UserTypeEnum? CopyUserType { get; set; }
 
-
+        public BusinessLevel? BusinessLevelEnum { get; set; }
 
     }
 

IRaCIS.Core.Application/Service/Common/EmailNoticeConfigService.cs

@@ -25,6 +25,7 @@ namespace IRaCIS.Core.Application.Contracts
             .WhereIf(inQuery.SystemLevel == null, t => t.SystemLevel == SysEmailLevel.not_sys)
             .WhereIf(inQuery.SystemLevel != null, t => t.SystemLevel == inQuery.SystemLevel)
             .WhereIf(inQuery.IsDistinguishCriteria != null, t => t.IsDistinguishCriteria == inQuery.IsDistinguishCriteria)
+             .WhereIf(inQuery.BusinessLevelEnum != null, t => t.BusinessLevelEnum == inQuery.BusinessLevelEnum)
             .WhereIf(inQuery.CriterionTypeEnum != null, t => t.CriterionTypeEnum == inQuery.CriterionTypeEnum)
              .WhereIf(inQuery.BusinessModuleEnum != null, t => t.BusinessModuleEnum == inQuery.BusinessModuleEnum)
             .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
@@ -43,9 +44,10 @@ namespace IRaCIS.Core.Application.Contracts
         {
             var verifyExp1 = new EntityVerifyExp<EmailNoticeConfig>()
             {
-                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum,
+                VerifyExp = t => t.BusinessScenarioEnum == addOrEditEmailNoticeConfig.BusinessScenarioEnum && t.CriterionTypeEnum== addOrEditEmailNoticeConfig.CriterionTypeEnum,
 
                 VerifyMsg = _localizer["EmailNoticeConfig_RepeatEmailScenario"]
+
             };
 
             // 匹配所有占位符的正则表达式，允许包含空格的占位符

IRaCIS.Core.Application/Service/Common/_MapConfig.cs

@@ -76,6 +76,9 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
 
+            CreateMap<InternationalizationAddOrEdit, IRCGlobalInfoDTO>();
+            
+
             CreateMap<Internationalization, BatchInternationalizationDto>().ReverseMap();
 
             CreateMap<Internationalization, IRCGlobalInfoDTO>();

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -1244,8 +1244,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
 
-            var emailNoticeConfigQueryable = _emailNoticeConfigRepository
+            var emailNoticeConfigQueryable = _emailNoticeConfigRepository.Where(t=>t.BusinessLevelEnum==BusinessLevel.Trial)        
-           .WhereIf(inQuery.SystemLevel == null, t => t.SystemLevel == SysEmailLevel.not_sys)
            .WhereIf(inQuery.BusinessScenarioEnum != null, t => t.BusinessScenarioEnum == inQuery.BusinessScenarioEnum)
            .WhereIf(inQuery.IsReturnRequired != null, t => t.IsReturnRequired == inQuery.IsReturnRequired)
            .WhereIf(inQuery.IsEnable != null, t => t.IsEnable == inQuery.IsEnable)

IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs

@@ -23,7 +23,7 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity
     public string AttachPath { get; set; } = null!;
 
     [Comment("业务级别")]
-    public int BusinessLevelEnum { get; set; }
+    public BusinessLevel BusinessLevelEnum { get; set; }
 
     [Comment("业务模块")]
     public BusinessModule BusinessModuleEnum { get; set; }
@@ -83,6 +83,21 @@ public class EmailNoticeUserType : Entity
     public EmailUserType EmailUserType { get; set; }
 }
 
+public enum BusinessLevel
+{
+    Default=0,
+
+
+    System=1,
+
+    //需要手动添加到项目的邮件
+    Trial=2,
+
+    //项目默认发送的邮件，不需要手动添加到项目
+    TrialDefault=3
+}
+
+
 public enum BusinessModule
 {
     /// <summary>