feat: nameEn显示

This commit is contained in:
2026-06-09 16:03:51 +08:00
parent e9975af591
commit e720cefaf7
8 changed files with 72 additions and 4 deletions

View File

@@ -1,4 +1,6 @@
namespace Dlhis.Basic.Organization.Response;
using Newtonsoft.Json;
namespace Dlhis.Basic.Organization.Response;
public class GainfoAllPageResponse
{
@@ -9,6 +11,10 @@ public class GainfoAllPageResponse
/// </summary>
public string Name { get; set; }
[JsonIgnore]
public string NameEn { get; set; }
/// <summary>
/// 工号
/// </summary>

View File

@@ -23,6 +23,10 @@ public class GainfoDetailResponse
/// </summary>
public string Name { get; set; }
[JsonIgnore]
public string NameEn { get; set; }
/// <summary>
/// 学工号
/// </summary>

View File

@@ -27,6 +27,9 @@ public class GainfoPageResponse
/// </summary>
public string Name { get; set; }
[JsonIgnore]
public string NameEn { get; set; }
/// <summary>
/// 工号
/// </summary>

View File

@@ -166,6 +166,12 @@ public class GainfoService : IGainfoService
gainfo.CardTypeName = gainfo.CardType is 1 or 0 or null
? "全时段"
: basicTypes.FirstOrDefault(x => x.Code == gainfo.CardType.ToString())?.Display;
if (gainfo.NameEn.IsPresent())
{
gainfo.Name = $"{gainfo.Name}({gainfo.NameEn})";
}
});
return page;
@@ -184,6 +190,11 @@ public class GainfoService : IGainfoService
{
x.Workplace = tenants.FirstOrDefault(item => item.Code == x.Workplace)?.Name;
x.Factory = tenants.FirstOrDefault(item => item.Code == x.Factory)?.Name;
if (x.NameEn.IsPresent())
{
x.Name = $"{x.Name}({x.NameEn})";
}
});
return page;
@@ -382,6 +393,7 @@ public class GainfoService : IGainfoService
No = ga.No,
InternalNo = ga.InternalNo,
Name = ga.Name,
NameEn = ga.NameEn,
Code = ga.Code,
IdClass = ga.IdClass,
IdNo = ga.IdNo,
@@ -438,6 +450,12 @@ public class GainfoService : IGainfoService
{
//ignore
}
if (info.NameEn.IsPresent())
{
info.Name = $"{info.Name}({info.NameEn})";
}
}
return info;