diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs
index 3b8c97d7a..a3b68127f 100644
--- a/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs
@@ -243,7 +243,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
dialogMsg.AppendLine($"
");
dialogMsg.AppendLine(@$"
{_localizer["ConsistencyVerification_Desc"]}
");
- dbSV.CheckResult = _localizer["ConsistencyVerification_Conf"] +
+ dbSV.CheckResult =
String.Join(" | ", dbExceptExcel.Select(t => $"{_localizer["ConsistencyVerification_EdcL", t.StudyDate, t.Modality, _systemEmailConfig.SystemShortName]}")) + " | "
+ String.Join(" | ", excelExceptDB.Select(t => $"{_localizer["ConsistencyVerification_IrcLi", t.StudyDate, t.Modality, _systemEmailConfig.SystemShortName]}"));
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
index 5e05110c0..bbf5a5f0c 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
@@ -112,6 +112,8 @@ namespace IRaCIS.Core.Application.ViewModel
public int? State { get; set; }
+ public int InternationalizationType { get; set; }
+
}
public class BatchAddInternationalizationDto : BatchInternationalizationDto
@@ -124,6 +126,7 @@ namespace IRaCIS.Core.Application.ViewModel
public string Version { get; set; }
public DateTime CreateTime { get; set; }
+
}
public class BatchUpdateInfoCommand
diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
index 77897fce0..3508c9c51 100644
--- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
+++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
@@ -45,10 +45,11 @@ namespace IRaCIS.Core.Application.Service
ValueCN = t.ValueCN,
FrontType = t.FrontType,
Description = t.Description,
- Module=t.Module,
+ Module = t.Module,
State = t.State,
- Version=t.PublishLog.Version,
+ Version = t.PublishLog.Version,
CreateTime = t.CreateTime,
+ InternationalizationType = t.InternationalizationType
}).ToListAsync();
await _fusionCache.SetAsync>(CacheKeys.FrontInternational, list, TimeSpan.FromDays(1));
@@ -59,7 +60,7 @@ namespace IRaCIS.Core.Application.Service
}
///
- /// 前端批量提交,后端判断不存在就添加,存在就更新
+ /// 前端批量提交,后端查询判断不存在就添加,存在就更新 (这里提交接口也能提交后端的标识,对后端标识进行更新)
///
///
[AllowAnonymous]
@@ -69,7 +70,7 @@ namespace IRaCIS.Core.Application.Service
foreach (var item in batchList)
{
- var find = await _internationalizationRepository.FirstOrDefaultAsync(t => t.Code == item.Code && t.Description == item.Description && t.InternationalizationType == 0);
+ var find = await _internationalizationRepository.FirstOrDefaultAsync(t => t.Code == item.Code && t.InternationalizationType == item.InternationalizationType);
if (find != null)
{
@@ -81,7 +82,7 @@ namespace IRaCIS.Core.Application.Service
var frontState = item.State == null ? 0 : (int)item.State;
var mapItem = _mapper.Map(item);
- mapItem.InternationalizationType = 0;
+ //mapItem.InternationalizationType = 0;
// 0 是预翻译 1是已确认 2是后端废弃
mapItem.State = frontState;