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

This commit is contained in:
2025-07-03 14:30:16 +08:00
parent 0e476c5151
commit ed56457688
2 changed files with 4 additions and 4 deletions

View File

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