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-04-09 21:54:43 +08:00
parent e37771df4a
commit d5c6a98d4e
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,12 +26,15 @@ public class DeviceUploadLogService : IDeviceUploadLogService
public async Task<Pagination<DeviceUploadLogResponse>> GetPageAsync(DeviceUploadLogPageRequest request)
{
var sw = Stopwatch.StartNew();
DeviceUploadLogTypeEnumType? type = request.Type == DeviceTypeEnumType.Attendance
? DeviceUploadLogTypeEnumType.Attendance
: request.Type == DeviceTypeEnumType.Door ? DeviceUploadLogTypeEnumType.Door
: null;
var query = _dbContext.Queryable<DeviceUploadLogEntity>()
return await _dbContext.Queryable<DeviceUploadLogEntity>()
.LeftJoin<DeviceEntity>((deviceUp, device) => deviceUp.DeviceUniqueNo == device.UniqueNo)
.LeftJoin<GainfoEntity>((deviceUp, device, ga) => deviceUp.UserUniqueNo == ga.Code)
.WhereIF(request.Type.HasValue, (deviceUp, device) => device.Type == request.Type)
.WhereIF(type.HasValue, (deviceUp, device) => deviceUp.Type == type)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, deviceUp => deviceUp.RaiseDateTime >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, deviceUp => deviceUp.RaiseDateTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.Search.IsPresent(), (deviceUp, device, ga) =>
@@ -52,13 +55,8 @@ public class DeviceUploadLogService : IDeviceUploadLogService
UserCode = ga.Code,
UserName = ga.Name,
DeployPlace = device.DeployPlace
});
//.ToPageListAsync(request);
_logger.LogInformation("执行sql:{sql}", query.ToSqlString());
var page = await query.ToPageListAsync(request);
_logger.LogInformation("执行时间:{ms}", sw.ElapsedMilliseconds);
return page;
})
.ToPageListAsync(request);
}
public async Task UploadLogsAsync(List<DeviceUploadLogUploadRequest> requests)