From a47062b3d82123d45d40dc7fbf54f95d2080e009 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 27 Dec 2024 15:50:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Request/DeviceUploadLogPageRequest.cs | 12 +----------- .../Services/Implements/DeviceUploadLogService.cs | 7 +++---- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs index 63f4c1aa..87349ff1 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs @@ -5,7 +5,7 @@ using Kurisu.AspNetCore.DataAccess.Dto; namespace Dlhis.ScheduledTask.DeviceUploadLog.Request; -public class DeviceUploadLogPageRequest : PageDto, IValidatableObject +public class DeviceUploadLogPageRequest : PageDto { /// /// 设备类型 DeviceTypeEnumType @@ -27,14 +27,4 @@ public class DeviceUploadLogPageRequest : PageDto, IValidatableObject /// 日期范围查询 /// public DateTimePeriod SearchDateTimePeriod { get; set; } - - public IEnumerable Validate(ValidationContext validationContext) - { - if (SearchDateTimePeriod is { End: not null }) - { - SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1); - } - - yield break; - } } diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs index 69f36178..8beeafa1 100644 --- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs +++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs @@ -6,7 +6,6 @@ using Dlhis.ScheduledTask.DeviceUploadLog.Response; using Kurisu.AspNetCore.Authentication.Abstractions; using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.DataAccess.Dto; -using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; using Kurisu.AspNetCore.Utils.Extensions; using SqlSugar; @@ -200,7 +199,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService .LeftJoin((x, device) => x.DeviceUniqueNo == device.UniqueNo) .LeftJoin((x, device, ga) => x.UserUniqueNo == ga.Code) .LeftJoin((x, device, ga, os) => x.UserUniqueNo == os.Code) - .LeftJoin((x, device, ga, os, gasap) => gasap.Code == os.SapCode) + .LeftJoin((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)) @@ -213,13 +212,13 @@ public class DeviceUploadLogService : IDeviceUploadLogService x.UserUniqueNo == request.Search || x.DeviceUniqueNo == request.Search ) .OrderBy(x => x.ModifiedTime, OrderByType.Desc) - .Select((x, device, ga, os, gasap) => new DeviceUploadLogResponse + .Select((x, device, ga, os, gaSap) => new DeviceUploadLogResponse { Id = x.Id, OriginUserUniqueNo = x.UserUniqueNo, OutsourceSupplier = os.Supplier, SapUserCode = os.SapCode, - SapUserName = gasap.Name, + SapUserName = gaSap.Name, DeviceUniqueNo = x.DeviceUniqueNo, RaiseDateTime = x.RaiseDateTime, CreateTime = x.CreateTime,