diff --git a/AsbCloudApp/Data/ScheduleDto.cs b/AsbCloudApp/Data/ScheduleDto.cs
index 84cbe515..a8c8d652 100644
--- a/AsbCloudApp/Data/ScheduleDto.cs
+++ b/AsbCloudApp/Data/ScheduleDto.cs
@@ -39,13 +39,13 @@ namespace AsbCloudApp.Data
/// Начало бурения
///
[Required]
- public DateTime DrillStart { get; set; }
+ public DateTimeOffset DrillStart { get; set; }
///
/// Конец бурения
///
[Required]
- public DateTime DrillEnd { get; set; }
+ public DateTimeOffset DrillEnd { get; set; }
///
/// Бурильщик
diff --git a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
index e7c2aa1f..7c7e6491 100644
--- a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
+++ b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
@@ -82,10 +82,9 @@ namespace AsbCloudInfrastructure.Repository
protected override Schedule Convert(ScheduleDto dto)
{
- var hoursOffset = wellService.GetTimezone(dto.IdWell).Hours;
var entity = base.Convert(dto);
- entity.DrillStart = dto.DrillStart.ToUtcDateTimeOffset(hoursOffset);
- entity.DrillEnd = dto.DrillEnd.ToUtcDateTimeOffset(hoursOffset);
+ entity.DrillStart = dto.DrillStart.ToUniversalTime();
+ entity.DrillEnd = dto.DrillEnd.ToUniversalTime();
return entity;
}
@@ -93,8 +92,8 @@ namespace AsbCloudInfrastructure.Repository
{
var hoursOffset = wellService.GetTimezone(entity.IdWell).Hours;
var dto = base.Convert(entity);
- dto.DrillStart = entity.DrillStart.ToRemoteDateTime(hoursOffset);
- dto.DrillEnd = entity.DrillEnd.ToRemoteDateTime(hoursOffset);
+ dto.DrillStart = entity.DrillStart.ToOffset(TimeSpan.FromHours(hoursOffset));
+ dto.DrillEnd = entity.DrillEnd.ToOffset(TimeSpan.FromHours(hoursOffset));
return dto;
}
}
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
index b53b1cd0..b645f567 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
@@ -264,7 +264,7 @@ public class DetectedOperationService : IDetectedOperationService
&& v.DepthStart <= dto.DepthStart
&& v.DepthEnd > dto.DepthStart);
- var dateStart = dto.DateStart;
+ var dateStart = dto.DateStart.ToUniversalTime();
var timeStart = new TimeDto(dateStart);
var driller = schedules.FirstOrDefault(s =>
s.DrillStart <= dateStart &&
diff --git a/AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs b/AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs
index 58f23ccc..69473ebd 100644
--- a/AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs
+++ b/AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs
@@ -178,8 +178,8 @@ public class DailyReportServiceTest
IdWell = idWell,
ShiftStart = new TimeDto(1),
ShiftEnd = new TimeDto(5),
- DrillStart = new DateTime(2023, 01, 26),
- DrillEnd = new DateTime(2023, 12, 26),
+ DrillStart = new DateTimeOffset(2023, 01, 26, 0, 0, 0, TimeSpan.Zero),
+ DrillEnd = new DateTimeOffset(2023, 12, 26, 0, 0, 0, TimeSpan.Zero),
Driller = new()
{
Name = "Иван",