diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs index df762093..1ba5b36d 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs @@ -32,17 +32,33 @@ 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); + DateTimeOffset ExtractDate(DateTime dateTime) + { + var dateTimeOffset = dateTime.ToUtcDateTimeOffset(well!.Timezone.Hours); + var date = new DateTimeOffset(dateTimeOffset.Year, dateTimeOffset.Month, dateTimeOffset.Day, 0,0,0,TimeSpan.Zero); + return date; + } + if (begin is not null) - query = query.Where(d => d.StartDate >= begin.Value.Date); + { + var beginUTC = ExtractDate(begin.Value); + query = query.Where(d => d.StartDate >= beginUTC); + } if (end is not null) - query = query.Where(d => d.StartDate <= end.Value.Date); + { + var endUTC = ExtractDate(end.Value); + query = query.Where(d => d.StartDate <= endUTC); + } var entities = await query + .OrderBy(e => e.StartDate) .ToListAsync(token); - return entities.Select(r => Convert(r)); }