refactor 不取count
This commit is contained in:
@@ -245,7 +245,7 @@ public class AssignmentService : IAssignmentService
|
||||
|
||||
var data = await CommonHelper.RetryAsync(async () =>
|
||||
{
|
||||
var page = await _dbContext.Queryable<DeviceTaskEntity>()
|
||||
var rows = await _dbContext.Queryable<DeviceTaskEntity>()
|
||||
.LeftJoin<DeviceEntity>((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
|
||||
.LeftJoin<DeviceTemplateEntity>((deviceTask, device, deviceTemplate) => deviceTemplate.Code == device.TemplateCode)
|
||||
.LeftJoin<GainfoEntity>((deviceTask, device, deviceTemplate, ga) => deviceTask.UserNo == ga.No)
|
||||
@@ -294,14 +294,14 @@ public class AssignmentService : IAssignmentService
|
||||
: SqlFunc.ToInt32(ga.CardType)
|
||||
: 1
|
||||
})
|
||||
.ToPageListAsync(request);
|
||||
.ToPageListAsync(request.PageIndex, request.PageSize);
|
||||
|
||||
if (!page.Data.Any())
|
||||
if (!rows.Any())
|
||||
{
|
||||
return page.Data;
|
||||
return rows;
|
||||
}
|
||||
|
||||
var taskIdVs = page.Data.Select(x => new { x.TaskId, x.Version, x.Status }).ToList();
|
||||
var taskIdVs = rows.Select(x => new { x.TaskId, x.Version, x.Status }).ToList();
|
||||
var where = LinqExpressionExtensions.False<DeviceTaskEntity>();
|
||||
taskIdVs.ForEach(p => { where = where.Or(x => x.Id == p.TaskId && x.Version == p.Version && x.Status == p.Status); });
|
||||
|
||||
@@ -317,7 +317,7 @@ public class AssignmentService : IAssignmentService
|
||||
throw new VersionExceptions("version exceptions");
|
||||
}
|
||||
|
||||
return page.Data;
|
||||
return rows;
|
||||
}, 5);
|
||||
|
||||
return data;
|
||||
|
||||
Reference in New Issue
Block a user