From 942330fd1d1ce9a1864356697fab0e53f4816ada Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 29 Feb 2024 13:02:41 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskAssignment/Request/DeviceTaskGetRequest.cs          | 6 ++++++
 .../TaskAssignment/Services/Implements/AssignmentService.cs | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskGetRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskGetRequest.cs
index 178481ce..84cf335e 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskGetRequest.cs
+++ b/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>
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
index dee7e916..745c3e60 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
+++ b/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)
             {