feat: nameEn显示
This commit is contained in:
@@ -32,6 +32,10 @@ public class BalanceRecordResponse : IExcelExportable
|
||||
[Excel("姓名")]
|
||||
public string Name { get; set; }
|
||||
|
||||
|
||||
[JsonIgnore]
|
||||
public string NameEn { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 学工号
|
||||
/// </summary>
|
||||
|
||||
@@ -93,6 +93,24 @@ public class BalanceService : IBalanceService
|
||||
})
|
||||
.ToPageListAsync(request);
|
||||
|
||||
var userCodes = page.Data.Select(x => x.UserCode).Distinct().ToList();
|
||||
var gainfos = await _dbContext.Queryable<GainfoEntity>().Where(x => userCodes.Contains(x.Code)).Select(x => new { x.Code, x.Name, x.NameEn }).ToListAsync();
|
||||
var gainfoLeaves = await _dbContext.Queryable<GainfoLeaveEntity>().Where(x => userCodes.Contains(x.Code)).Select(x => new { x.Code, x.Name, x.NameEn }).ToListAsync();
|
||||
|
||||
page.Data.ForEach(item =>
|
||||
{
|
||||
var nameEn = gainfos.FirstOrDefault(x => x.Code == item.UserCode)?.NameEn;
|
||||
if (nameEn.IsEmpty())
|
||||
{
|
||||
nameEn = gainfoLeaves.FirstOrDefault(x => x.Code == item.UserCode)?.NameEn;
|
||||
}
|
||||
|
||||
if (nameEn.IsPresent())
|
||||
{
|
||||
item.Name = $"{item.Name}({nameEn})";
|
||||
}
|
||||
});
|
||||
|
||||
try
|
||||
{
|
||||
var tenants = await _tenantApi.GetTenantsInternalAsync();
|
||||
|
||||
Reference in New Issue
Block a user