fix 处理已知问题

This commit is contained in:
2025-04-15 14:46:29 +08:00
parent 5c0e8584da
commit 6fa4a3ccd5
9 changed files with 132 additions and 5 deletions

View File

@@ -63,7 +63,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
var timeSetting = await _dbContext.Queryable<WorkGridTimePeriodEntity>().Where(x => x.Type == request.PeriodType).Select(x => new { x.Start, x.Before }).SingleAsync();
timeSetting.ThrowIfNull("工作网格时间尚未配置,无法操作");
var currentLimit = request.Date.ToDateTime(timeSetting.Start.Add(-TimeSpan.FromSeconds(timeSetting.Before)));
(DateTime.Now >= currentLimit).ThrowIfTrue("当前时间不可修改排班信息");
@@ -265,7 +265,7 @@ public class WorkGridScheduleService : IWorkGridScheduleService
var t = request.IsError.ToString().ToLower();
var filterString = $"{{\"IsError\":{t}";
return await _dbContext.Queryable<DeviceUploadLogEntity>()
var r = await _dbContext.Queryable<DeviceUploadLogEntity>()
.LeftJoin<DeviceEntity>((log, d) => log.DeviceUniqueNo == d.UniqueNo)
.LeftJoin<GainfoEntity>((log, d, ga) => log.UserUniqueNo == ga.Code)
.WhereIF(request.DateTimePeriod.HasValue(), log => log.RaiseDateTime >= request.DateTimePeriod.Start
@@ -294,7 +294,15 @@ public class WorkGridScheduleService : IWorkGridScheduleService
Status = log.Status,
WorkGridInfo = log.WorkGridInfo,
})
.ToPageListAsync(request);
.ToPageListAsync(request.PageIndex, request.PageSize);
return new Pagination<WorkGridScheduleAttendancePageResponse>
{
PageIndex = request.PageIndex,
PageSize = request.PageSize,
Total = 0,
Data = r
};
}
public async Task<Pagination<WorkGridScheduleAttendancePageResponse>> GetAllAttendancePageAsync(WorkGridScheduleAttendancePageRequest request)