fix 下发任务状态,类型查询

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

@@ -1,7 +1,20 @@
-using Kurisu.Core.DataAccess.Dto;
+using System.ComponentModel.DataAnnotations;
+using Dlhis.Entity.Device.Enums;
+using Kurisu.Core.DataAccess.Dto;
 
 namespace Dlhis.ScheduledTask.TaskAssignment.Request;
 
 public class DeviceTaskAssignmentRequest : PageDto
 {
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    [EnumDataType(typeof(DeviceTaskEnumType))]
+    public DeviceTaskEnumType? Type { get; set; }
+
+    /// <summary>
+    /// 任务下发状态
+    /// </summary>
+    [EnumDataType(typeof(DeviceTaskStatusEnumType))]
+    public DeviceTaskStatusEnumType? Status { get; set; }
 }

Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs

@@ -5,6 +5,8 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Response;
 
 public class DeviceTaskAssignmentResponse
 {
+    public long Id { get; set; }
+
     /// <summary>
     /// 任务类型
     /// </summary>

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

@@ -23,10 +23,13 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
     {
         var page = await _dbContext.Queryable<DeviceTaskEntity>()
             .LeftJoin<GainfoEntity>((deviceTask, ga) => deviceTask.UserNo == ga.No)
-            .WhereIF(!request.Search.IsEmpty(), deviceTask => deviceTask.UserNo == request.Search)
+            .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga) => deviceTask.UserNo == request.Search || ga.Name.Contains(request.Search))
+            .WhereIF(request.Type.HasValue, deviceTask => deviceTask.Type == request.Type)
+            .WhereIF(request.Status.HasValue, deviceTask => deviceTask.Status == request.Status)
             .OrderBy(deviceTask => deviceTask.CreateTime, OrderByType.Desc)
             .Select((deviceTask, ga) => new DeviceTaskAssignmentResponse
             {
+                Id = deviceTask.Id,
                 DeviceUniqueNo = deviceTask.DeviceUniqueNo,
                 ResultMessage = deviceTask.ResultMessage,
                 RetryCount = deviceTask.Version,