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-08-04 16:41:27 +08:00
parent cdb39dc424
commit 6217b0cafd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
View File

@@ -44,7 +44,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
)
.WhereIF(request.UserNo.IsPresent(), deviceTask => deviceTask.UserNo == request.UserNo)
.Where(deviceTask => deviceTask.TenantId == request.Factory)
.WhereIF(request.Type.HasValue, deviceTask => deviceTask.DeviceType == request.Type)
.WhereIF(request.Type.HasValue, (deviceTask, device) => deviceTask.DeviceType == request.Type && device.Enable) //过滤未启用的设备任务
.WhereIF(request.TaskTypes.IsPresent(), deviceTask => request.TaskTypes.Contains(deviceTask.Type))
.WhereIF(request.Status.IsPresent(), deviceTask => request.Status.Contains(deviceTask.Status))
.WhereIF(!request.Search.IsEmpty(), (deviceTask, device, ga, gaLeave) =>
@@ -189,7 +189,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
.ToListAsync();
await _dbContext.Client.Deleteable<DeviceTaskEntity>()
.Where(x=> request.Ids.Contains(x.Id))
.Where(x => request.Ids.Contains(x.Id))
.ExecuteCommandAsync();
tasks.ForEach(x =>