From aca027e9e6b233c583847d4c855120e6a8878745 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 9 Jun 2025 14:09:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0where=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Implements/DeviceTaskAssignmentService.cs | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs index f2c8f363..23a8d100 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs @@ -105,13 +105,14 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService public async Task> GetPageWarningAsync(DeviceTaskAssignmentRequest request) { - var rows = await _dbContext.Queryable() + var page = await _dbContext.Queryable() .LeftJoin((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo) .LeftJoin((deviceTask, device, ga) => deviceTask.UserNo == ga.No) .LeftJoin((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No) .LeftJoin((deviceTask, device, ga, gaLeave, deviceRegistry) => deviceRegistry.DeviceUniqueNo == deviceTask.DeviceUniqueNo) .Where(deviceTask => deviceTask.TenantId == request.Factory) - .WhereIF(request.Type.HasValue, deviceTask => deviceTask.DeviceType == request.Type) + .Where(deviceTask => deviceTask.DeviceType == request.Type) + .Where(deviceTask => deviceTask.Status == DeviceTaskStatusEnumType.Process) .WhereIF(!request.Search.IsEmpty(), (deviceTask, device, ga) => ga.Name == request.Search || ga.Code == request.Search @@ -139,12 +140,14 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService CreateBy = deviceTask.CreatedBy, Source = deviceTask.Source }) - .ToPageListAsync(request.PageIndex, request.PageSize); + .ToPageListAsync(request); + //.ToPageListAsync(request.PageIndex, request.PageSize); try { var tenants = await _tenantApi.GetTenantsInternalAsync(); - rows.ForEach(item => { item.TenantName = tenants.FirstOrDefault(x => x.Code == item.TenantId)?.Name; }); + //rows.ForEach(item => { item.TenantName = tenants.FirstOrDefault(x => x.Code == item.TenantId)?.Name; }); + page.Data.ForEach(item => { item.TenantName = tenants.FirstOrDefault(x => x.Code == item.TenantId)?.Name; }); } catch (Exception) { @@ -153,22 +156,25 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService try { - var userIds = rows.Select(x => x.CreateBy).Distinct().ToList(); + //var userIds = rows.Select(x => x.CreateBy).Distinct().ToList(); + var userIds = page.Data.Select(x => x.CreateBy).Distinct().ToList(); var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds }); - rows.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreateBy)?.OperatorName); + page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreateBy)?.OperatorName); } catch (Exception e) { _logger.LogError("获取人员数据失败:{error}", e.Message); } - return new Pagination - { - PageIndex = request.PageIndex, - PageSize = request.PageSize, - Total = 0, - Data = rows - }; + // return new Pagination + // { + // PageIndex = request.PageIndex, + // PageSize = request.PageSize, + // Total = 0, + // Data = rows + // }; + + return page; }