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

修改qc 审核 问题类型 国际化

Uat_Study
{872297557@qq.com} 2023-01-17 16:04:44 +08:00
parent c5a138d7cf
commit 4ad3ee56bf
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Common/DTO/SystemBasicDataViewModel.cs
View File

@ -25,7 +25,6 @@ namespace IRaCIS.Core.Application.Contracts
{ {
public Guid Id { get; set; } public Guid Id { get; set; }
public string Name { get; set; } = string.Empty; public string Name { get; set; } = string.Empty;
public string ValueCN { get; set; } = string.Empty;
public string Value { get; set; } = string.Empty; public string Value { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty; public string Code { get; set; } = string.Empty;

2
IRaCIS.Core.Application/Service/Common/SystemBasicDataService.cs
View File

@ -99,7 +99,7 @@ namespace IRaCIS.Core.Application.Services
public async Task<Dictionary<string, List<SystemBasicDataSelect>>> GetBasicDataSelect(string[] searchArray) public async Task<Dictionary<string, List<SystemBasicDataSelect>>> GetBasicDataSelect(string[] searchArray)
{ {
var searchList = await _systemBasicDataRepository.Where(t => searchArray.Contains(t.Parent.Code) && t.ParentId != null).ProjectTo<SystemBasicDataSelect>(_mapper.ConfigurationProvider).ToListAsync(); var searchList = await _systemBasicDataRepository.Where(t => searchArray.Contains(t.Parent.Code) && t.ParentId != null).ProjectTo<SystemBasicDataSelect>(_mapper.ConfigurationProvider,new { _userInfo.IsEn_Us}).ToListAsync();
return searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.ToList()); return searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.ToList());

6
IRaCIS.Core.Application/Service/Common/_MapConfig.cs
View File

@ -25,8 +25,10 @@ namespace IRaCIS.Core.Application.Service
CreateMap<SystemBasicData, SystemBasicDataView>(); CreateMap<SystemBasicData, SystemBasicDataView>();
var isEn_Us = false;
CreateMap<SystemBasicData, SystemBasicDataSelect>() CreateMap<SystemBasicData, SystemBasicDataSelect>()
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code))
.ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us? u.Value:u.ValueCN));
CreateMap<SystemBasicDataAddOrEdit, SystemBasicData>().ReverseMap(); CreateMap<SystemBasicDataAddOrEdit, SystemBasicData>().ReverseMap();
@ -40,7 +42,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<Dictionary, BasicDicSelect>() CreateMap<Dictionary, BasicDicSelect>()
.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum)) .ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
.ForMember(o => o.Value, t => t.MapFrom(u => u.MappedValue))
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
var token = ""; var token = "";