feat 增加任务类型获取

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

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity.Device.Enums;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.DataAccess.Dto;
 
@@ -16,6 +17,11 @@ public class DeviceTaskGetRequest : PageDto, IValidatableObject
     /// </summary>
     public string DeviceUniqueNo { get; set; }
 
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    public List<DeviceTaskEnumType> Types { get; set; }
+
     /// <summary>
     /// 获取处理中的任务
     /// </summary>

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

@@ -40,6 +40,7 @@ public class AssignmentService : IAssignmentService
              .LeftJoin<DepartmentEntity>((deviceTask, deivce, deivceTamplate, ga, department) => department.No == ga.DepartmentNo)
              .WhereIF(request.Brand.IsPresent(), (deviceTask, deivce, deivceTamplate) => deivceTamplate.Brand == request.Brand)
              .WhereIF(request.DeviceUniqueNo.IsPresent(), (deviceTask, deivce) => deviceTask.DeviceUniqueNo == request.DeviceUniqueNo)
+             .WhereIF(request.Types.IsPresent(), deviceTask => request.Types.Contains(deviceTask.Type))
              .WhereIF(!request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Wait)
              .WhereIF(request.IsProcess, deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Process)
              .OrderBy(deviceTask => deviceTask.CreateTime)
@@ -98,6 +99,7 @@ public class AssignmentService : IAssignmentService
             }
 
             return page.Data;
+
         }, 5);
 
         if (!data.Any())
@@ -354,7 +356,7 @@ public class AssignmentService : IAssignmentService
             }
             catch (Exception ex) when (ex is VersionExceptions)
             {
-                _logger.LogWarning(ex, ex.Message);
+                _logger.LogWarning(ex, "并发更新失败:{message},", ex.Message);
             }
             catch (Exception)
             {