From 02b38b9b47f49c9b09e26336225e20b1d6065d29 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 16 Jan 2024 19:13:07 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=E6=A1=A3=E6=A1=88id?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskAssignment/Response/UserToDeviceResponse.cs    |  9 ++++++---
 .../Services/Implements/AssignmentService.cs           | 10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/UserToDeviceResponse.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/UserToDeviceResponse.cs
index 4d8e3b79..b2d752f3 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/UserToDeviceResponse.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/UserToDeviceResponse.cs
@@ -1,9 +1,12 @@
-using Newtonsoft.Json;
-
-namespace Dlhis.ScheduledTask.TaskAssignment.Response;
+namespace Dlhis.ScheduledTask.TaskAssignment.Response;
 
 public class UserToDeviceResponse
 {
+    /// <summary>
+    /// 人员唯一id
+    /// </summary>
+    public long UserId { 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 e49d24f0..92654640 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
@@ -44,7 +44,8 @@ public class AssignmentService : IAssignmentService
              .OrderBy(deviceTask => deviceTask.CreateTime)
              .Select((deviceTask, deivce, deivceTamplate, ga, department) => new
              {
-                 deviceTask.Id,
+                 UserId = ga.Id,
+                 TaskId = deviceTask.Id,
                  deviceTask.Type,
                  deviceTask.DeviceUniqueNo,
                  DeviceConnectionInfo = deivce.ConnectionInfo,
@@ -64,11 +65,11 @@ public class AssignmentService : IAssignmentService
                 return page.Data;
             }
 
-            var taskIdVs = page.Data.Select(x => new { x.Id, x.Version }).ToList();
+            var taskIdVs = page.Data.Select(x => new { x.TaskId, x.Version }).ToList();
             Expression<Func<DeviceTaskEntity, bool>> where = LinqExpressionExtension.False<DeviceTaskEntity>();
             taskIdVs.ForEach(p =>
             {
-                where = where.Or(x => x.Id == p.Id && x.Version == p.Version && x.Status != DeviceTaskStatusEnumType.Success);
+                where = where.Or(x => x.Id == p.TaskId && x.Version == p.Version && x.Status != DeviceTaskStatusEnumType.Success);
             });
 
             await _dbContext.Client.Ado.BeginTranAsync();
@@ -132,10 +133,11 @@ public class AssignmentService : IAssignmentService
 
                           return new TaskCombineUserDimensionDto
                           {
-                              TaskId = item.Id,
+                              TaskId = item.TaskId,
                               Type = item.Type,
                               UserInfo = new UserToDeviceResponse
                               {
+                                  UserId = item.UserId,
                                   UserNo = item.UserNo,
                                   UserCode = item.UserCode,
                                   UserName = item.UserName,