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
{
+ ///
+ /// 人员唯一id
+ ///
+ public long UserId { get; set; }
+
///
/// 人员档案号
///
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> where = LinqExpressionExtension.False();
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,