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

IRaCIS.Core.Application/MassTransit/Consumer/Dto/SendImageReuploadEmailDto.cs

@@ -21,6 +21,8 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer.Dto
 
         public RequestBackStateEnum RequestBackStateEnum { get; set; } = RequestBackStateEnum.NotRequest;
 
+        public ReReadingApplyState ReReadingApplyState { get; set; } = ReReadingApplyState.Default;
+
 
 
 

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

@@ -248,7 +248,8 @@ public class ImageConsumer(
                 EmailNoticeConfig = emailConfig,
                 Scenario = scenario,
                 SubjectVisit = subjectVisit,
-                TrialId = trialId
+                TrialId = trialId,
+                ReReadingApplyState= context.Message.ReReadingApplyState,
             };
             await SendImageReuploadEmail(inDto);
         }
@@ -327,16 +328,18 @@ public class ImageConsumer(
         List<DictionaryDto> dictionaryDtos = new List<DictionaryDto>() {
              new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=inDto.SubjectVisit.IsUrgent.ToString().ToLower(), }, //是否加急
             };
-        if (inDto.Scenario == EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading)
+        switch (inDto.Scenario)
         {
-            dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "RequestBackState", EnumValue = inDto.RequestBackStateEnum.GetEnumInt(), });
+            case EmailBusinessScenario.Re_ReadApproval_SPMCPMApprovalRe_Reading:
+                dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ReReadingApplyState", EnumValue = inDto.ReReadingApplyState.GetEnumInt(), });
+                break;
+            case EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading:
+                dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "RequestBackState", EnumValue = inDto.RequestBackStateEnum.GetEnumInt(), });
+                break;
+            default:
+                dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackStateEnum", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果
+                break;
         }
-        else
-        {
-            dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackStateEnum", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果
-        }
-
-
         var dictionValue = await CommonEmailHelper.TranslationDictionary(new TranslationDictionaryDto()
         {