yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 任务来源

Browse Source
This commit is contained in:
liguoyang
2024-08-03 11:11:06 +08:00
parent 32987e45cb
commit 02acb878dc
15 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Src/Dlhis.ScheduledTask/TaskAssignment/Dto/TaskDto.cs
View File

@@ -1,4 +1,4 @@
using Dlhis.Entity.Device.Entities;
using Dlhis.Entity.Basic.Enums;
using Dlhis.Entity.Device.Enums;
namespace Dlhis.ScheduledTask.TaskAssignment.Dto;
@@ -17,6 +17,7 @@ public class TaskDto
public string OldUserNo { get; set; }
public string UserCode { get; set; }
public GainfoUserTypeEnumType UserType { get; set; }
public string UserName { get; set; }
public string DepartmentNo { get; set; }
public string DepartmentName { get; set; }

8
Src/Dlhis.ScheduledTask/TaskAssignment/Response/UserToDeviceResponse.cs
View File

@@ -1,4 +1,5 @@
using Kurisu.AspNetCore.CustomClass;
using Dlhis.Entity.Basic.Enums;
using Kurisu.AspNetCore.CustomClass;
namespace Dlhis.ScheduledTask.TaskAssignment.Response;
@@ -24,6 +25,11 @@ public class UserToDeviceResponse
/// </summary>
public string UserCode { get; set; }
/// <summary>
/// 人员类型
/// </summary>
public GainfoUserTypeEnumType UserType { get; set; }
/// <summary>
/// 人员名称
/// </summary>

2
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
View File

@@ -89,6 +89,7 @@ public class AssignmentService : IAssignmentService
UserNo = item.UserNo,
OldUserNo = item.OldUserNo,
UserCode = item.UserCode,
UserType = item.UserType,
UserName = item.UserName,
DepartmentNo = item.DepartmentNo,
DepartmentName = item.DepartmentName,
@@ -276,6 +277,7 @@ public class AssignmentService : IAssignmentService
: deviceTask.UserId,
TaskId = deviceTask.Id,
Type = deviceTask.Type,
UserType = ga.Type,
DeviceUniqueNo = deviceTask.DeviceUniqueNo,
DeviceConnectionInfo = device.ConnectionInfo,
Brand = deviceTemplate.Brand,