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

fix 更新时间到3点30; 调整索引使用顺序

Browse Source
This commit is contained in:
liguoyang
2025-07-03 14:30:16 +08:00
parent 0e476c5151
commit ed56457688
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs
View File

@@ -104,7 +104,7 @@ public class BalanceRecordUploadBackgroundService : BackgroundService
try try
{ {
if (now is { Hour: 5, Minute: 1 } if (now is { Hour: 3, Minute: 30 }
&& !_healthCheckService.GetIsOffline() && !_healthCheckService.GetIsOffline()
&& !await db.Queryable<LocalBalanceRecordEntity>().Where(x => !x.IsSync).AnyAsync()) && !await db.Queryable<LocalBalanceRecordEntity>().Where(x => !x.IsSync).AnyAsync())
{ {

6
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
View File

@@ -251,10 +251,9 @@ public class AssignmentService : IAssignmentService
.LeftJoin<GainfoLeaveEntity>((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No) .LeftJoin<GainfoLeaveEntity>((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No)
.LeftJoin<DepartmentEntity>((deviceTask, device, ga, gaLeave, department) => department.No == ga.DepartmentNo) .LeftJoin<DepartmentEntity>((deviceTask, device, ga, gaLeave, department) => department.No == ga.DepartmentNo)
.LeftJoin<DeviceRegistryEntity>((deviceTask, device, ga, gaLeave, department, deviceRegistry) => deviceRegistry.DeviceUniqueNo == deviceTask.DeviceUniqueNo) .LeftJoin<DeviceRegistryEntity>((deviceTask, device, ga, gaLeave, department, deviceRegistry) => deviceRegistry.DeviceUniqueNo == deviceTask.DeviceUniqueNo)
.WhereIF(request.DeviceUniqueNo.IsPresent(), (deviceTask, device) => .Where((deviceTask, device) =>
deviceTask.DeviceUniqueNo == request.DeviceUniqueNo &&
deviceTask.CreateTime >= limitTime && deviceTask.CreateTime >= limitTime &&
device.Enable && deviceTask.DeviceUniqueNo == request.DeviceUniqueNo &&
deviceTask.Version < 10 deviceTask.Version < 10
) )
.WhereIF(!request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Wait) .WhereIF(!request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Wait)
@@ -265,6 +264,7 @@ public class AssignmentService : IAssignmentService
.Where((deviceTask, device, ga, gaLeave, department, deviceRegistry) => .Where((deviceTask, device, ga, gaLeave, department, deviceRegistry) =>
device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now) device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) > DateTime.Now)
#endif #endif
.Where((deviceTask, device) => device.Enable)
.OrderBy(deviceTask => new { deviceTask.CreateTime, Priority = SqlFunc.Desc(deviceTask.Priority) }) .OrderBy(deviceTask => new { deviceTask.CreateTime, Priority = SqlFunc.Desc(deviceTask.Priority) })
.Select((deviceTask, device, ga, gaLeave, department) => new TaskDto .Select((deviceTask, device, ga, gaLeave, department) => new TaskDto
{ {