Compare commits

..

No commits in common. "c6c036c152b839450c6e7e2469a4de631821b5b0" and "263f43b1a9950b9a0bed95c0e6da97eb11cb586a" have entirely different histories.

3 changed files with 6 additions and 10 deletions

View File

@ -243,7 +243,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer
dialogMsg.AppendLine($"<br/>");
dialogMsg.AppendLine(@$"<div>{_localizer["ConsistencyVerification_Desc"]}</div>");
dbSV.CheckResult =
dbSV.CheckResult = _localizer["ConsistencyVerification_Conf"] +
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]}"));

View File

@ -112,8 +112,6 @@ namespace IRaCIS.Core.Application.ViewModel
public int? State { get; set; }
public int InternationalizationType { get; set; }
}
public class BatchAddInternationalizationDto : BatchInternationalizationDto
@ -126,7 +124,6 @@ namespace IRaCIS.Core.Application.ViewModel
public string Version { get; set; }
public DateTime CreateTime { get; set; }
}
public class BatchUpdateInfoCommand

View File

@ -45,11 +45,10 @@ 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<List<InternationalizationSimpleDto>>(CacheKeys.FrontInternational, list, TimeSpan.FromDays(1));
@ -60,7 +59,7 @@ namespace IRaCIS.Core.Application.Service
}
/// <summary>
/// 前端批量提交,后端查询判断不存在就添加,存在就更新 (这里提交接口也能提交后端的标识,对后端标识进行更新)
/// 前端批量提交,后端判断不存在就添加,存在就更新
/// </summary>
/// <returns></returns>
[AllowAnonymous]
@ -70,7 +69,7 @@ namespace IRaCIS.Core.Application.Service
foreach (var item in batchList)
{
var find = await _internationalizationRepository.FirstOrDefaultAsync(t => t.Code == item.Code && t.InternationalizationType == item.InternationalizationType);
var find = await _internationalizationRepository.FirstOrDefaultAsync(t => t.Code == item.Code && t.Description == item.Description && t.InternationalizationType == 0);
if (find != null)
{
@ -82,7 +81,7 @@ namespace IRaCIS.Core.Application.Service
var frontState = item.State == null ? 0 : (int)item.State;
var mapItem = _mapper.Map<Internationalization>(item);
//mapItem.InternationalizationType = 0;
mapItem.InternationalizationType = 0;
// 0 是预翻译 1是已确认 2是后端废弃
mapItem.State = frontState;