From d5c6a98d4ee3d9e8e93f9350a6dbf1c6e6649cb9 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 9 Apr 2024 21:54:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=B4=A2=E5=BC=95=E5=91=BD=E4=B8=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/DeviceUploadLogService.cs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index b38621bf..3ff6995e 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -26,12 +26,15 @@ public class DeviceUploadLogService : IDeviceUploadLogService public async Task> 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() + return await _dbContext.Queryable() .LeftJoin((deviceUp, device) => deviceUp.DeviceUniqueNo == device.UniqueNo) .LeftJoin((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 requests)