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-12-27 15:50:27 +08:00
parent c30534e544
commit a47062b3d8
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogPageRequest.cs
View File

@@ -5,7 +5,7 @@ using Kurisu.AspNetCore.DataAccess.Dto;
namespace Dlhis.ScheduledTask.DeviceUploadLog.Request; namespace Dlhis.ScheduledTask.DeviceUploadLog.Request;
public class DeviceUploadLogPageRequest : PageDto, IValidatableObject public class DeviceUploadLogPageRequest : PageDto
{ {
/// <summary> /// <summary>
/// 设备类型 DeviceTypeEnumType /// 设备类型 DeviceTypeEnumType
@@ -27,14 +27,4 @@ public class DeviceUploadLogPageRequest : PageDto, IValidatableObject
/// 日期范围查询 /// 日期范围查询
/// </summary> /// </summary>
public DateTimePeriod SearchDateTimePeriod { get; set; } public DateTimePeriod SearchDateTimePeriod { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (SearchDateTimePeriod is { End: not null })
{
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
}
yield break;
}
} }

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

@@ -6,7 +6,6 @@ using Dlhis.ScheduledTask.DeviceUploadLog.Response;
using Kurisu.AspNetCore.Authentication.Abstractions; using Kurisu.AspNetCore.Authentication.Abstractions;
using Kurisu.AspNetCore.CustomClass; using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto; using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.AspNetCore.Utils.Extensions;
using SqlSugar; using SqlSugar;
@@ -200,7 +199,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
.LeftJoin<DeviceEntity>((x, device) => x.DeviceUniqueNo == device.UniqueNo) .LeftJoin<DeviceEntity>((x, device) => x.DeviceUniqueNo == device.UniqueNo)
.LeftJoin<GainfoEntity>((x, device, ga) => x.UserUniqueNo == ga.Code) .LeftJoin<GainfoEntity>((x, device, ga) => x.UserUniqueNo == ga.Code)
.LeftJoin<OutsourceEntity>((x, device, ga, os) => x.UserUniqueNo == os.Code) .LeftJoin<OutsourceEntity>((x, device, ga, os) => x.UserUniqueNo == os.Code)
.LeftJoin<GainfoEntity>((x, device, ga, os, gasap) => gasap.Code == os.SapCode) .LeftJoin<GainfoEntity>((x, device, ga, os, gaSap) => gaSap.Code == os.SapCode)
.WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.RaiseDateTime >= request.SearchDateTimePeriod.Start .WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.RaiseDateTime >= request.SearchDateTimePeriod.Start
&& x.RaiseDateTime <= request.SearchDateTimePeriod.End) && x.RaiseDateTime <= request.SearchDateTimePeriod.End)
.Where((x, device) => x.Type == type && !SqlFunc.IsNullOrEmpty(x.UserUniqueNo)) .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 x.UserUniqueNo == request.Search || x.DeviceUniqueNo == request.Search
) )
.OrderBy(x => x.ModifiedTime, OrderByType.Desc) .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, Id = x.Id,
OriginUserUniqueNo = x.UserUniqueNo, OriginUserUniqueNo = x.UserUniqueNo,
OutsourceSupplier = os.Supplier, OutsourceSupplier = os.Supplier,
SapUserCode = os.SapCode, SapUserCode = os.SapCode,
SapUserName = gasap.Name, SapUserName = gaSap.Name,
DeviceUniqueNo = x.DeviceUniqueNo, DeviceUniqueNo = x.DeviceUniqueNo,
RaiseDateTime = x.RaiseDateTime, RaiseDateTime = x.RaiseDateTime,
CreateTime = x.CreateTime, CreateTime = x.CreateTime,