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-13 16:31:04 +08:00
parent 02a2971256
commit a33f86969b
17 changed files with 162 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,20 +157,22 @@ public class DeviceUploadLogService : IDeviceUploadLogService
.LeftJoin<DeviceUploadLogEntity>((os, x) => os.Code == x.UserUniqueNo)
.LeftJoin<DeviceEntity>((os, x, device) => x.DeviceUniqueNo == device.UniqueNo)
.LeftJoin<GainfoEntity>((os, x, device, ga) => os.Code == ga.Code)
.LeftJoin<GainfoEntity>((os, x, device, ga, gasap) => gasap.Code == os.SapCode)
.WhereIF(request.Search.IsPresent(), (os, x, device, ga, gasap) =>
.LeftJoin<GainfoEntity>((os, x, device, ga, gaSap) => gaSap.Code == os.SapCode)
.WhereIF(request.SearchDateTimePeriod.HasValue(), (os, x) => x.RaiseDateTime >= request.SearchDateTimePeriod.Start
&& x.RaiseDateTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.Search.IsPresent(), (os, x, device, ga, gaSap) =>
x.UserUniqueNo == request.Search
|| x.DeviceUniqueNo == request.Search
|| os.Supplier == request.Search
|| os.SapCode == request.Search
).OrderBy((os, x, device, ga, gasap) => x.ModifiedTime, OrderByType.Desc)
.Select((os, x, device, ga, gasap) => new DeviceUploadLogResponse
).OrderBy((os, x, device, ga, gaSap) => x.ModifiedTime, OrderByType.Desc)
.Select((os, x, device, ga, 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,
@@ -198,7 +200,8 @@ public class DeviceUploadLogService : IDeviceUploadLogService
.LeftJoin<GainfoEntity>((x, device, ga) => x.UserUniqueNo == ga.Code)
.LeftJoin<OutsourceEntity>((x, device, ga, os) => x.UserUniqueNo == os.Code)
.LeftJoin<GainfoEntity>((x, device, ga, os, gasap) => gasap.Code == os.SapCode)
.WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.RaiseDateTime >= request.SearchDateTimePeriod.Start && x.RaiseDateTime <= request.SearchDateTimePeriod.End)
.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))
.WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
.WhereIF(request.IsOutsource.HasValue && request.IsOutsource.Value,