yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 取消获取总数

Browse Source
This commit is contained in:
liguoyang
2025-08-15 11:05:37 +08:00
parent 34cae4c8fd
commit 2ec2086b20
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
View File

@@ -34,7 +34,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageAsync(DeviceTaskAssignmentRequest request) public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageAsync(DeviceTaskAssignmentRequest request)
{ {
var page = await _dbContext.Queryable<DeviceTaskEntity>() var rows = await _dbContext.Queryable<DeviceTaskEntity>()
.LeftJoin<DeviceEntity>((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo) .LeftJoin<DeviceEntity>((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
.LeftJoin<GainfoEntity>((deviceTask, device, ga) => deviceTask.UserNo == ga.No) .LeftJoin<GainfoEntity>((deviceTask, device, ga) => deviceTask.UserNo == ga.No)
.LeftJoin<GainfoLeaveEntity>((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No) .LeftJoin<GainfoLeaveEntity>((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No)
@@ -79,12 +79,12 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
CreateBy = deviceTask.CreatedBy, CreateBy = deviceTask.CreatedBy,
Source = deviceTask.Source Source = deviceTask.Source
}) })
.ToPageListAsync(request); .ToPageListAsync(request.PageIndex, request.PageSize);
try try
{ {
var tenants = await _tenantApi.GetTenantsInternalAsync(); var tenants = await _tenantApi.GetTenantsInternalAsync();
page.Data.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; });
} }
catch (Exception) catch (Exception)
{ {
@@ -93,16 +93,22 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
try try
{ {
var userIds = page.Data.Select(x => x.CreateBy).Distinct().ToList(); var userIds = rows.Select(x => x.CreateBy).Distinct().ToList();
var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds }); var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds });
page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreateBy)?.OperatorName); rows.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreateBy)?.OperatorName);
} }
catch (Exception e) catch (Exception e)
{ {
_logger.LogError("获取人员数据失败:{error}", e.Message); _logger.LogError("获取人员数据失败:{error}", e.Message);
} }
return page; return new Pagination<DeviceTaskAssignmentResponse>
{
PageIndex = request.PageIndex,
PageSize = request.PageSize,
Total = 0,
Data = rows
};
} }
public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageWarningAsync(DeviceTaskAssignmentRequest request) public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageWarningAsync(DeviceTaskAssignmentRequest request)