From 0b291e8b219a6da8c1df5ccd4e480a0132e3df5d Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 7 May 2025 15:46:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 10 +++++-----
.../MassTransit/Consumer/ImageConsumer.cs | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 870d100f4..3e29f92ca 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -14251,12 +14251,12 @@
- 用户提交 发送邮件 通知SPM 或者PM
+ 用户提交 发送邮件 通知SPM 或者PM 项目默认邮件，不用添加到项目中，直接发送的
-
+
- 用户提交 发送邮件 通知SPM 或者PM
+ 用户提交 发送邮件 通知SPM 或者PM 项目默认邮件，不用添加到项目中，直接发送的
@@ -14264,7 +14264,7 @@
调研表初审通过，进行复审发送邮件
-
+
调研表初审通过，进行复审发送邮件
@@ -14274,7 +14274,7 @@
调研表驳回发送邮件 之前已有，需要迁移过来
-
+
调研表驳回发送邮件 之前已有，需要迁移过来
diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
index 2c55411dd..02fe36c3b 100644
--- a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
@@ -238,7 +238,6 @@ public class ImageConsumer(
default:
return; // 其他状态不发送邮件
}
-
var trialEmailConfig = _emailNoticeConfigrepository.Where(t => t.BusinessScenarioEnum == scenario && t.IsEnable).FirstOrDefault();
if (trialEmailConfig != null)
@@ -261,6 +260,7 @@ public class ImageConsumer(
{
var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
+ inDto.SubjectVisit = await _subjectVisitRepository.Where(x => x.Id == inDto.SubjectVisit.Id).Include(x => x.Subject).FirstNotNullAsync();
// 获取项目信息
var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == inDto.TrialId);
From 0787875b3b962bf94a114cedcb823324dac656b1 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 8 May 2025 09:50:03 +0800
Subject: [PATCH 2/2] =?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/Consumer/CommonEmailHelper.cs | 2 +-
IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs b/IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs
index aa7f44b6b..f02d835e0 100644
--- a/IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs
@@ -134,7 +134,7 @@ Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr
inDto.DictionaryList.ForEach(x =>
{
- var dic = dicList.Where(y => y.EnumValue == x.EnumValue && y.DictionaryCode == x.DictionaryCode).FirstOrDefault();
+ var dic = dicList.Where(y => y.EnumValue == x.EnumValue && y.DictionaryCode.Equals(x.DictionaryCode,StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
result.Add(dic == null ? string.Empty : (inDto.IsEn_US ? dic.Value : dic.ValueCN));
});
diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
index 649e6e509..dbdab6bce 100644
--- a/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
@@ -325,7 +325,7 @@ public class ImageConsumer(
List dictionaryDtos = new List() {
- new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=inDto.SubjectVisit.IsUrgent.ToString(), }, //是否加急
+ new DictionaryDto (){DictionaryCode= "YesOrNo",EnumValue=inDto.SubjectVisit.IsUrgent.ToString().ToLower(), }, //是否加急
};
if (inDto.Scenario == EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading)
{
@@ -333,7 +333,7 @@ public class ImageConsumer(
}
else
{
- dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackState", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果
+ dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackStateEnum", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果
}