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
2025-01-08 17:53:19 +08:00
parent 64e4adf500
commit e8bb6941d2
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,10 +241,17 @@ public class DeviceUploadLogService : IDeviceUploadLogService
&& x.RaiseDateTime <= request.SearchDateTimePeriod.End)
.Where((x, device) => x.Type == type && x.UserType == userType)
.WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
.WhereIF(request.Search.IsPresent(), (x, device, ga, os) =>
x.UserUniqueNo == request.Search || x.DeviceUniqueNo == request.Search
.WhereIF(request.Search.IsPresent() && userType == GainfoUserTypeEnumType.Outsource, (x, device, ga, os) =>
x.UserUniqueNo == request.Search
|| x.DeviceUniqueNo == request.Search
|| os.Supplier == request.Search
|| os.SapCode == request.Search
)
.OrderBy(x => x.ModifiedTime, OrderByType.Desc)
.WhereIF(request.Search.IsPresent() && userType != GainfoUserTypeEnumType.Outsource, (x, device, ga, os) =>
x.UserUniqueNo == request.Search
|| x.DeviceUniqueNo == request.Search
)
.OrderBy(x => x.RaiseDateTime, OrderByType.Desc)
.Select((x, device, ga, os, gaSap) => new DeviceUploadLogResponse
{
Id = x.Id,