fix 优化任务,增加设备类型

Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs

@@ -132,6 +132,8 @@ public class DevicePermissionService : IDevicePermissionService
                         DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo,
                         Status = DeviceTaskStatusEnumType.Wait,
                         Type = DeviceTaskEnumType.Delete,
+                        CancellationId = 0,
+                        DeviceType = deivces.First(item => item.Code == x).Type,
                         UserNo = userNo,
                         Version = 0,
                         TenantId = tenant,
@@ -142,6 +144,7 @@ public class DevicePermissionService : IDevicePermissionService
                         DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo,
                         Status = DeviceTaskStatusEnumType.Wait,
                         Type = DeviceTaskEnumType.Add,
+                        DeviceType = deivces.First(item => item.Code == x).Type,
                         UserNo = userNo,
                         Version = 0,
                         TenantId = tenant,
@@ -222,6 +225,7 @@ public class DevicePermissionService : IDevicePermissionService
                     DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo,
                     Status = DeviceTaskStatusEnumType.Wait,
                     Type = DeviceTaskEnumType.Delete,
+                    DeviceType = deivces.First(item => item.Code == x).Type,
                     UserNo = userNo,
                     Version = 0,
                     TenantId = tenant,
@@ -232,6 +236,7 @@ public class DevicePermissionService : IDevicePermissionService
                     DeviceUniqueNo = deivces.First(item => item.Code == x).UniqueNo,
                     Status = DeviceTaskStatusEnumType.Wait,
                     Type = DeviceTaskEnumType.Add,
+                    DeviceType = deivces.First(item => item.Code == x).Type,
                     UserNo = userNo,
                     Version = 0,
                     TenantId = tenant,
@@ -264,6 +269,7 @@ public class DevicePermissionService : IDevicePermissionService
             DeviceUniqueNo = x.UniqueNo,
             Status = DeviceTaskStatusEnumType.Wait,
             Type = taskType,
+            DeviceType = x.Type,
             UserNo = userNo,
             CancellationId = 0,
             Version = 0,

Src/Dlhis.Basic/Organization/Services/Implements/GainfoPermissionService.cs

@@ -229,6 +229,7 @@ public class GainfoPermissionService : IGainfoPermissionService
             Status = DeviceTaskStatusEnumType.Wait,
             UserNo = request.UserNo,
             Type = request.IsLeave ? DeviceTaskEnumType.Delete : DeviceTaskEnumType.Add,
+            DeviceType =  x.Type,
             TenantId = gainfo.Factory,
         })
         .ToList();

Src/Dlhis.Entity/Device/Entities/DeviceTaskEntity.cs

@@ -18,6 +18,12 @@ public class DeviceTaskEntity : SugarBaseEntity, ITenantId, IVersion
     [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
     public DeviceTaskEnumType Type { get; set; }
 
+    /// <summary>
+    /// 设备类型
+    /// </summary>
+    [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public DeviceTypeEnumType? DeviceType { get; set; }
+
     /// <summary>
     /// 用户id
     /// </summary>

Src/Dlhis.ScheduledTask/Jobs/CreateSyncServerDateTimeJob.cs

@@ -40,6 +40,7 @@ public class CreateSyncServerDateTimeJob : BaseJob
             Version = 0,
             UserNo = string.Empty,
             Type = DeviceTaskEnumType.SyncDateTime,
+            DeviceType = x.Type,
 
             CreatedBy = 1,
             CreateTime = DateTime.Now,

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

@@ -28,16 +28,14 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
         var page = await _dbContext.Queryable<DeviceTaskEntity>()
             .LeftJoin<GainfoEntity>((deviceTask, ga) => deviceTask.UserNo == ga.No)
             .LeftJoin<DeviceEntity>((deviceTask, ga, device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
+            .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.Search.IsEmpty(), (deviceTask, ga, device) =>
-            deviceTask.UserNo == request.Search
-            || ga.Name.Contains(request.Search)
+               ga.Name == request.Search
             || ga.Code == request.Search
             || deviceTask.DeviceUniqueNo == request.Search
             )
-            .WhereIF(request.TaskTypes.IsPresent(), deviceTask => request.TaskTypes.Contains(deviceTask.Type))
-            .WhereIF(request.Type.HasValue, (deviceTask, ga, device) => device.Type == request.Type)
-            .WhereIF(request.Status.IsPresent(), deviceTask => request.Status.Contains(deviceTask.Status))
-            .Where(deviceTask => 1 == 1)
             .OrderBy(deviceTask => deviceTask.CreateTime, OrderByType.Desc)
             .Select((deviceTask, ga, device) => new DeviceTaskAssignmentResponse
             {