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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-08-27 15:05:48 +08:00
parent a9afb684c9 9c447dbd68
commit f14d4bf373
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -516,6 +516,7 @@ namespace IRaCIS.Core.Application.Service
Identification = u.Identification, Identification = u.Identification,
ForeignKeyValue = p.ForeignKeyValue, ForeignKeyValue = p.ForeignKeyValue,
ForeignKeyText = p.ForeignKeyText, ForeignKeyText = p.ForeignKeyText,
p.ForeignKeyEnText,
ForeignKeyTable = p.ForeignKeyTableName ForeignKeyTable = p.ForeignKeyTableName
}).ToListAsync(); }).ToListAsync();
list = list.GroupBy(x => new { x.Key }, (key, lst) => new list = list.GroupBy(x => new { x.Key }, (key, lst) => new
@ -524,6 +525,7 @@ namespace IRaCIS.Core.Application.Service
Identification = string.Empty, Identification = string.Empty,
ForeignKeyValue = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyValue ?? lst.Max(x => x.ForeignKeyValue), ForeignKeyValue = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyValue ?? lst.Max(x => x.ForeignKeyValue),
ForeignKeyText = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyText ?? lst.Max(x => x.ForeignKeyText), ForeignKeyText = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyText ?? lst.Max(x => x.ForeignKeyText),
ForeignKeyEnText = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyEnText),
ForeignKeyTable = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyTable), ForeignKeyTable = lst.FirstOrDefault(y => y.Identification == identification)?.ForeignKeyTable ?? lst.Max(x => x.ForeignKeyTable),
}).ToList(); }).ToList();
@ -538,6 +540,11 @@ namespace IRaCIS.Core.Application.Service
string Table = item.ForeignKeyTable; string Table = item.ForeignKeyTable;
string ForeignKeyValue = item.ForeignKeyValue; string ForeignKeyValue = item.ForeignKeyValue;
string ForeignKeyText = item.ForeignKeyText; string ForeignKeyText = item.ForeignKeyText;
if (_userInfo.IsEn_Us && !item.ForeignKeyEnText.IsNullOrEmpty())
{
ForeignKeyText = item.ForeignKeyEnText;
}
if (jsonDataValueDic[item.Key] != null) if (jsonDataValueDic[item.Key] != null)
{ {
string value = jsonDataValueDic[item.Key].ToString(); string value = jsonDataValueDic[item.Key].ToString();