fix 任务来源

Src/Dlhis.ScheduledTask/DeviceUploadLog/Request/DeviceUploadLogMyRecordRequest.cs

@@ -10,10 +10,7 @@ public class DeviceUploadLogMyRecordRequest : IValidatableObject
     /// <inheritdoc />
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        if (DateTimePeriod == null)
-        {
-            DateTimePeriod = new DateTimePeriod();
-        }
+        DateTimePeriod ??= new DateTimePeriod();
 
         if (DateTimePeriod.Start != null)
         {

Src/Dlhis.ScheduledTask/Jobs/CreateGetUploadRecordJob.cs

@@ -39,6 +39,7 @@ public class CreateGetUploadRecordJob : BaseJob
             Type = DeviceTaskEnumType.UploadRecord,
             CancellationId = 0,
             Priority = 50,
+            Source = DeviceTaskSourceEnumType.Schedule
         }).ToList();
 
         await DbContext.InsertAsync(tasks);

Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs

@@ -40,6 +40,7 @@ public class CreateSyncServerDateTimeJob : BaseJob
             Type = DeviceTaskEnumType.SyncDateTime,
             DeviceType = x.Type,
             Priority = 49,
+            Source = DeviceTaskSourceEnumType.Schedule
         }).ToList();
 
         await DbContext.InsertAsync(tasks);

Src/Dlhis.ScheduledTask/TaskAssignment/Dto/TaskDto.cs

@@ -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; }

Src/Dlhis.ScheduledTask/TaskAssignment/Response/UserToDeviceResponse.cs

@@ -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>

Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs

@@ -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,