From 98c60a0d86c727f0b3b6c22ec2c7c717b7611782 Mon Sep 17 00:00:00 2001 From: eugeniy_ivanov Date: Sat, 29 Oct 2022 20:28:55 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B0=D1=82=20=D0=B2=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BB=D1=8C=D1=82=D1=80=D0=B5=20=D0=B4=D0=BB=D1=8F=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B8=D1=81=D0=BA=D0=B0=20=D0=BA=20=D0=BA=D0=BE=D1=80?= =?UTF-8?q?=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D0=BC=D1=83=20=D0=B7=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8E.=20=20=D0=9C=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B4=20GetListAsync?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyReport/DailyReportService.cs | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) 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) From b974e6237f41a17ed7ba5a0f87229d32e1b4bb4e Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Mon, 31 Oct 2022 13:51:54 +0500 Subject: [PATCH 2/2] nit --- .../DailyReport/DailyReportService.cs | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs index 3fa2915b..1ba5b36d 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs @@ -37,37 +37,29 @@ namespace AsbCloudInfrastructure.Services.DailyReport 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) { - DateTimeOffset beginUTC = begin.Value - .AddHours(5) - .ToUtcDateTimeOffset(well.Timezone.Hours); + var beginUTC = ExtractDate(begin.Value); query = query.Where(d => d.StartDate >= beginUTC); } if (end is not null) { - DateTimeOffset endUTC = end.Value - .AddHours(5) - .ToUtcDateTimeOffset(well.Timezone.Hours); + 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)); - //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)