fix 设备任务分页优化

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

@@ -1,5 +1,6 @@
 using Dlhis.Entity.Device.Enums;
 using Kurisu.AspNetCore.Utils.Extensions;
+using SqlSugar;
 
 namespace Dlhis.ScheduledTask.TaskAssignment.Response;
 
@@ -77,4 +78,14 @@ public class DeviceTaskAssignmentResponse
     /// 厂区名称
     /// </summary>
     public string TenantName { get; set; }
+
+    /// <summary>
+    /// 部署点
+    /// </summary>
+    public string DeployPlace { get; set; }
+
+    /// <summary>
+    /// 连接信息
+    /// </summary>
+    public string ConnectionInfo { get; set; }
 }

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

@@ -27,12 +27,13 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
     {
         var page = await _dbContext.Queryable<DeviceTaskEntity>()
             .LeftJoin<GainfoEntity>((deviceTask, ga) => deviceTask.UserNo == ga.No)
-            .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga) => deviceTask.UserNo == request.Search || ga.Name.Contains(request.Search))
+            .LeftJoin<DeviceEntity>((deviceTask, ga,device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
+            .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga,device) => deviceTask.UserNo == request.Search || ga.Name.Contains(request.Search) || ga.Code == request.Search || deviceTask.DeviceUniqueNo == request.Search || deviceTask.ModifiedTime.ToString("yyyy-MM-dd").Contains(request.Search))
             .WhereIF(request.Type.HasValue, deviceTask => deviceTask.Type == request.Type)
             .WhereIF(request.Status.HasValue, deviceTask => deviceTask.Status == request.Status)
             .Where(deviceTask => 1 == 1)
             .OrderBy(deviceTask => deviceTask.CreateTime, OrderByType.Desc)
-            .Select((deviceTask, ga) => new DeviceTaskAssignmentResponse
+            .Select((deviceTask, ga,device) => new DeviceTaskAssignmentResponse
             {
                 Id = deviceTask.Id,
                 DeviceUniqueNo = deviceTask.DeviceUniqueNo,
@@ -46,6 +47,8 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
                 CreateTime = deviceTask.CreateTime,
                 LastUpdateTime = deviceTask.ModifiedTime,
                 TenantId = deviceTask.TenantId,
+                DeployPlace = device.DeployPlace,
+                ConnectionInfo = device.ConnectionInfo
             })
             .ToPageListAsync(request);