yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 增加isError显示

Browse Source
This commit is contained in:
liguoyang
2025-03-17 12:05:31 +08:00
parent 57f111aaa7
commit e22672751c
2 changed files with 53 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,7 +176,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
{
var startTime = nightTimePeriod.Start.AddMinutes(-nightTimePeriod.Before);
var endTime = nightTimePeriod.End.AddMinutes(nightTimePeriod.After);
if (currentNightWorkGridSchedules.Any(x => x.Date == currentDateOnly))
{
var currentWorkGrid = workGrids.First(x => x.Code == currentNightWorkGridSchedules.First(p => p.Date == currentDateOnly).WorkGridCode);
@@ -186,7 +186,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
WorkGridName = currentWorkGrid.Name,
LeaderUserCode = currentWorkGrid.LeaderUserCode
};
var start = currentDateOnly.ToDateTime(startTime);
var end = currentDateOnly.ToDateTime(new TimeOnly(23, 59, 59, 999));
@@ -194,8 +194,6 @@ public class DeviceUploadLogService : IDeviceUploadLogService
{
workGridInfo.PeriodType = WorkGridTimePeriodEnumType.Night;
}
}
if (currentNightWorkGridSchedules.Any(x => x.Date == currentDateOnly.AddDays(-1)))
@@ -207,7 +205,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
WorkGridName = currentWorkGrid.Name,
LeaderUserCode = currentWorkGrid.LeaderUserCode
};
var start = currentDateOnly.AddDays(-1).ToDateTime(startTime);
var end = currentDateOnly.ToDateTime(endTime);
@@ -408,6 +406,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
NeedUpload = x.NeedUpload,
Sync = x.Sync,
Status = x.Status,
WorkGridInfo = x.WorkGridInfo
}).ToPageListAsync(request.PageIndex, request.PageSize);
return new Pagination<DeviceUploadLogUserResponse>
@@ -473,6 +472,7 @@ public class DeviceUploadLogService : IDeviceUploadLogService
NeedUpload = x.NeedUpload,
Sync = x.Sync,
Status = x.Status,
WorkGridInfo = x.WorkGridInfo
}).ToPageListAsync(request.PageIndex, request.PageSize);
return new Pagination<DeviceUploadLogResponse>