XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
hang 2025-05-08 11:44:42 +08:00
parent d76b24bc25 0787875b3b
commit 9f1110f91a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/MassTransit/Consumer/CommonEmailHelper.cs
View File

@ -134,7 +134,7 @@ Func<(string topicStr, string htmlBodyStr), (string topicStr, string htmlBodyStr
inDto.DictionaryList.ForEach(x => 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)); result.Add(dic == null ? string.Empty : (inDto.IsEn_US ? dic.Value : dic.ValueCN));
}); });

5
IRaCIS.Core.Application/MassTransit/Consumer/ImageConsumer.cs
View File

@ -261,6 +261,7 @@ public class ImageConsumer(
{ {
var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US; 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); var trialInfo = await _trialRepository.FirstOrDefaultAsync(t => t.Id == inDto.TrialId);
@ -324,7 +325,7 @@ public class ImageConsumer(
List<DictionaryDto> dictionaryDtos = new List<DictionaryDto>() { List<DictionaryDto> dictionaryDtos = new List<DictionaryDto>() {
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) if (inDto.Scenario == EmailBusinessScenario.DataReconciliation_PMApprovalRe_Uploading)
{ {
@ -332,7 +333,7 @@ public class ImageConsumer(
} }
else else
{ {
dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackState", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果 dictionaryDtos.Add(new DictionaryDto() { DictionaryCode = "ImageBackStateEnum", EnumValue = inDto.ImageBackStateEnum.GetEnumInt(), });//审批结果
} }