yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 优化查询

Browse Source
This commit is contained in:
liguoyang
2024-11-25 12:30:36 +08:00
parent 1ef6585a53
commit fc430d71be
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
View File

@@ -155,6 +155,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
.LeftJoin<DeviceEntity>((x, device) => x.DeviceUniqueNo == device.UniqueNo)
.LeftJoin<GainfoEntity>((x, device, ga) => x.UserUniqueNo == ga.Code)
.LeftJoin<OutsourceEntity>((x, device, ga, os) => x.UserUniqueNo == os.Code)
.LeftJoin<GainfoEntity>((x, device, ga, os, gasap) => gasap.Code == os.SapCode)
.WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.RaiseDateTime >= request.SearchDateTimePeriod.Start && x.RaiseDateTime <= request.SearchDateTimePeriod.End)
.Where((x, device) => x.Type == type && !SqlFunc.IsNullOrEmpty(x.UserUniqueNo))
.WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
@@ -170,13 +171,13 @@ public class DeviceUploadLogService : IDeviceUploadLogService
|| os.SapCode == request.Search
)
.OrderBy(x => x.ModifiedTime, OrderByType.Desc)
.Select((x, device, ga, os) => new DeviceUploadLogResponse
.Select((x, device, ga, os, gasap) => new DeviceUploadLogResponse
{
Id = x.Id,
OriginUserUniqueNo = x.UserUniqueNo,
OutsourceSupplier = os.Supplier,
SapUserCode = os.SapCode,
//SapUserName = ,
SapUserName = gasap.Name,
DeviceUniqueNo = x.DeviceUniqueNo,
RaiseDateTime = x.RaiseDateTime,
CreateTime = x.CreateTime,
@@ -190,19 +191,6 @@ public class DeviceUploadLogService : IDeviceUploadLogService
})
.ToPageListAsync(request);
var sapUserCodes = r.Data.Select(x => x.SapUserCode).Distinct().ToList();
var gainfos = await _dbContext.Queryable<GainfoEntity>().Where(x => sapUserCodes.Contains(x.Code)).Select(x => new { x.Code, x.Name }).ToListAsync();
foreach (var item in r.Data)
{
var s = gainfos.FirstOrDefault(x => x.Code == item.SapUserCode);
if (s != null)
{
item.SapUserName = s.Name;
}
}
return r;
}
}