fix 增加网格员名称名称
This commit is contained in:
@@ -315,7 +315,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
|
||||
request.UserCode = request.Search;
|
||||
}
|
||||
|
||||
return await _dbContext.Queryable<DeviceUploadLogEntity>()
|
||||
var page = await _dbContext.Queryable<DeviceUploadLogEntity>()
|
||||
.LeftJoin<DeviceEntity>((log, d) => log.DeviceUniqueNo == d.UniqueNo)
|
||||
.LeftJoin<GainfoEntity>((log, d, ga) => log.UserUniqueNo == ga.Code)
|
||||
.WhereIF(request.DateTimePeriod.HasValue(), log => log.RaiseDateTime >= request.DateTimePeriod.Start
|
||||
@@ -346,6 +346,22 @@ public class WorkGridScheduleService : IWorkGridScheduleService
|
||||
WorkGridInfo = log.WorkGridInfo,
|
||||
})
|
||||
.ToPageListAsync(request);
|
||||
|
||||
|
||||
var leaderUserCodes = page.Data.Select(x => x.LeaderUserCode).Distinct().ToList();
|
||||
var gainfos = await _dbContext.Queryable<GainfoEntity>().Where(x => leaderUserCodes.Contains(x.Code)).Select(x => new { x.Code, x.Name }).ToListAsync();
|
||||
|
||||
page.Data.ForEach(x =>
|
||||
{
|
||||
var gainfo = gainfos.FirstOrDefault(p => p.Code == x.LeaderUserCode);
|
||||
if (gainfo != null)
|
||||
{
|
||||
x.LeaderUserName = gainfo.Name;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
return page;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user