fix 任务获取支持根据厂区

Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskGetRequest.cs

@@ -27,11 +27,16 @@ public class DeviceTaskGetRequest : PageDto, IValidatableObject
     /// </summary>
     public bool IsProcess { get; set; } = false;
 
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string Factory { get; set; }
+
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        if (Brand.IsEmpty() && DeviceUniqueNo.IsEmpty())
+        if (Brand.IsEmpty() && DeviceUniqueNo.IsEmpty() && Factory.IsEmpty())
         {
-            yield return new ValidationResult("设备品牌和设备唯一号不能都为空", new[] { nameof(Brand), nameof(DeviceUniqueNo) });
+            yield return new ValidationResult("设备品牌,设备号和厂区不能都为空", new[] { nameof(Brand), nameof(DeviceUniqueNo), nameof(Factory) });
         }
     }
-}
+}

Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs

@@ -242,6 +242,7 @@ public class AssignmentService : IAssignmentService
                 .WhereIF(request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Process
                                                           && SqlFunc.DateDiff(DateType.Minute, deviceTask.ModifiedTime, DateTime.Now) > 30)
                 .WhereIF(request.DeviceUniqueNo.IsPresent(), (deviceTask, deivce) => deviceTask.DeviceUniqueNo == request.DeviceUniqueNo)
+                .WhereIF(request.Factory.IsPresent(), (deviceTask, deivce) => deviceTask.TenantId == request.Factory)
                 .WhereIF(request.Types.IsPresent(), deviceTask => request.Types.Contains(deviceTask.Type))
                 .WhereIF(request.Brand.IsPresent(), (deviceTask, deivce, deivceTamplate) => deivceTamplate.Brand == request.Brand)
                 .OrderBy(deviceTask => new { Priority = SqlFunc.Desc(deviceTask.Priority), deviceTask.CreateTime })