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 /// 厂区名称 /// public string TenantName { get; set; } + + /// + /// 部署点 + /// + public string DeployPlace { get; set; } + + /// + /// 连接信息 + /// + 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() .LeftJoin((deviceTask, ga) => deviceTask.UserNo == ga.No) - .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga) => deviceTask.UserNo == request.Search || ga.Name.Contains(request.Search)) + .LeftJoin((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);