From 0387689ad5b94f68f9f93cb65be5cdf928cb9522 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 17 Apr 2024 17:37:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0userno=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskAssignment/Request/DeviceTaskAssignmentRequest.cs | 2 ++ .../Services/Implements/DeviceTaskAssignmentService.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs index ed69bfdb..ba2a44a2 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs @@ -21,4 +21,6 @@ public class DeviceTaskAssignmentRequest : PageDto /// 任务下发状态 DeviceTaskStatusEnumType /// public List Status { get; set; } + + public string UserNo { get; set; } } diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs index ae023260..1e8c4095 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs @@ -31,9 +31,9 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService .WhereIF(request.TaskTypes.IsPresent(), deviceTask => request.TaskTypes.Contains(deviceTask.Type)) .WhereIF(request.Status.IsPresent(), deviceTask => request.Status.Contains(deviceTask.Status)) .WhereIF(request.Type.HasValue, (deviceTask, ga, device) => deviceTask.DeviceType == request.Type) + .WhereIF(request.UserNo.IsPresent(), deviceTask => deviceTask.UserNo == request.UserNo) .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga, device) => - ga.No == request.Search //详情使用 - || ga.Name == request.Search + ga.Name == request.Search || ga.Code == request.Search || deviceTask.DeviceUniqueNo == request.Search )