diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs index df762093..3fa2915b 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs @@ -32,18 +32,42 @@ namespace AsbCloudInfrastructure.Services.DailyReport public async Task> GetListAsync(int idWell, DateTime? begin, DateTime? end, CancellationToken token) { + var well = wellService.GetOrDefault(idWell); + if (well is null || well.Timezone is null) + return null; var query = db.DailyReports.Where(r => r.IdWell == idWell); if (begin is not null) - query = query.Where(d => d.StartDate >= begin.Value.Date); + { + DateTimeOffset beginUTC = begin.Value + .AddHours(5) + .ToUtcDateTimeOffset(well.Timezone.Hours); + query = query.Where(d => d.StartDate >= beginUTC); + } if (end is not null) - query = query.Where(d => d.StartDate <= end.Value.Date); + { + DateTimeOffset endUTC = end.Value + .AddHours(5) + .ToUtcDateTimeOffset(well.Timezone.Hours); + query = query.Where(d => d.StartDate <= endUTC); + } var entities = await query .ToListAsync(token); - return entities.Select(r => Convert(r)); + //var query = db.DailyReports.Where(r => r.IdWell == idWell); + + //if (begin is not null) + // query = query.Where(d => d.StartDate >= begin.Value.Date); + + //if (end is not null) + // query = query.Where(d => d.StartDate <= end.Value.Date); + + //var entities = await query + // .ToListAsync(token); + + //return entities.Select(r => Convert(r)); } public async Task GetOrGenerateAsync(int idWell, DateTime date, CancellationToken token)