diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index cd0bb120..63547016 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -370,13 +370,10 @@ public class AssignmentService : IAssignmentService var deviceNos = data.Select(x => x.DeviceUniqueNo).Distinct().ToList(); var result = new Dictionary(deviceNos.Count); - //日志数据最后一条 - var logInfos = await _dbContext.Queryable().Select(x => new + var logInfos = await _dbContext.Queryable().GroupBy(x => x.DeviceUniqueNo).Select(x => new { - RowNumber = SqlFunc.RowNumber(SqlFunc.Desc(x.RaiseDateTime), x.DeviceUniqueNo), - x.DeviceUniqueNo, - x.RaiseDateTime - }).MergeTable().Where(x => x.RowNumber == 1).ToListAsync(); + x.DeviceUniqueNo, RaiseDateTime = SqlFunc.AggregateMax(x.RaiseDateTime) + }).ToListAsync(); foreach (var item in deviceNos) {