From a0140627c020b6e52ec873b4ac0512d78fb4bed4 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 29 Feb 2024 10:53:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81,=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Request/DeviceTaskAssignmentRequest.cs        | 15 ++++++++++++++-
 .../Response/DeviceTaskAssignmentResponse.cs      |  2 ++
 .../Implements/DeviceTaskAssignmentService.cs     |  5 ++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
index a7c196f0..d41b722e 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
+++ b/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; }
 }
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs
index e525d6d3..96ae9243 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs
+++ b/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>
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index ce217e35..40f2386a 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/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,