on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

nit

Browse Source
This commit is contained in:
ngfrolov 2022-10-31 13:51:54 +05:00
parent 98c60a0d86
commit b974e6237f
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs
View File

@ -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<DailyReportDto> GetOrGenerateAsync(int idWell, DateTime date, CancellationToken token)