fix 设备/组新城枚举及调整
This commit is contained in:
@@ -38,53 +38,9 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
|
||||
LastUpdateTime = deviceTask.ModifiedTime
|
||||
})
|
||||
.ToPageListAsync(request);
|
||||
|
||||
return page;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 考勤任务记录
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public async Task<Pagination<TaskDetailResponse>> GetTaskRecords(TaskRecordsRequest request)
|
||||
|
||||
{
|
||||
//获取启用的功能设备
|
||||
var devices = await _dbContext.Queryable<DeviceEntity>()
|
||||
.Where(x => x.Type == request.type)
|
||||
.Select(x => x.UniqueNo)
|
||||
.ToListAsync();
|
||||
devices.ThrowIfNull($"{request.type.GetDescription}功能机器为空");
|
||||
|
||||
var lst = await _dbContext.Queryable<DeviceTaskEntity>()
|
||||
.LeftJoin<GainfoEntity>((task, ga) => task.UserNo == ga.No)
|
||||
.LeftJoin<DeviceEntity>((task, ga, de) => task.DeviceUniqueNo == de.UniqueNo)
|
||||
.Where(task => task.UserNo == request.GainfoNo)
|
||||
.Where(task => devices.Contains(task.DeviceUniqueNo))
|
||||
.Select((task, ga, de) => new TaskDetailResponse
|
||||
{
|
||||
DeviceUniqueNo = task.DeviceUniqueNo,
|
||||
UserCode = task.UserCode,
|
||||
Name = ga.Name,
|
||||
Status =task.Status.ToString(),
|
||||
DeviceDescription = de.DeployPlace,
|
||||
IP = de.ConnectionInfo
|
||||
}).ToListAsync();
|
||||
|
||||
// 分页操作
|
||||
var startIndex = (request.PageIndex - 1) * request.PageSize;
|
||||
var pagedData = lst.Skip(startIndex).Take(request.PageSize).ToList();
|
||||
|
||||
var pagination = new Pagination<TaskDetailResponse>
|
||||
{
|
||||
PageIndex = request.PageIndex,
|
||||
PageSize = request.PageSize,
|
||||
Total = lst.Count, // 使用原始列表的总数进行分页
|
||||
Data = pagedData
|
||||
};
|
||||
|
||||
return pagination;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user