From a1aa61b251cb7e324244fb789fc2ff0fc1698fd8 Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Thu, 7 Mar 2024 10:51:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=BE=E5=A4=87=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Response/DeviceTaskAssignmentResponse.cs          | 11 +++++++++++
 .../Implements/DeviceTaskAssignmentService.cs         |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs
index 73ad0d63..beeb82ed 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Response/DeviceTaskAssignmentResponse.cs
+++ b/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; }
 }
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index 8e7b2cb9..979f2b17 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/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);