From 15b74da498b0431e155d299cee84bb85aece4469 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Mon, 25 Mar 2024 09:45:48 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BC=D0=B5=D0=BD=D0=B0=20=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B2=20=D0=B4=D0=B0=D1=82=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9=20StatOperationsDto?=
 =?UTF-8?q?=20=D0=B8=20WellMapInfoDto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Data/StatOperationsDto.cs                         | 4 ++--
 AsbCloudApp/Data/WellMapInfoDto.cs                            | 4 ++--
 .../Services/WellOperationService/OperationsStatService.cs    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AsbCloudApp/Data/StatOperationsDto.cs b/AsbCloudApp/Data/StatOperationsDto.cs
index 7d082648..ec59eae0 100644
--- a/AsbCloudApp/Data/StatOperationsDto.cs
+++ b/AsbCloudApp/Data/StatOperationsDto.cs
@@ -11,12 +11,12 @@ namespace AsbCloudApp.Data
         /// <summary>
         /// Дата и время начала
         /// </summary>
-        public DateTime? Start { get; set; }
+        public DateTimeOffset? Start { get; set; }
 
         /// <summary>
         /// Дата и время окончания
         /// </summary>
-        public DateTime? End { get; set; }
+        public DateTimeOffset? End { get; set; }
 
         /// <summary>
         /// Глубина, м
diff --git a/AsbCloudApp/Data/WellMapInfoDto.cs b/AsbCloudApp/Data/WellMapInfoDto.cs
index a677a1e3..55098f4b 100644
--- a/AsbCloudApp/Data/WellMapInfoDto.cs
+++ b/AsbCloudApp/Data/WellMapInfoDto.cs
@@ -82,14 +82,14 @@ namespace AsbCloudApp.Data
         /// <para>Дата начала первой фактической операции</para>
         /// <para>Используется как дата начала бурения</para>
         /// </summary>
-        public DateTime? FirstFactOperationDateStart { get; set; }
+        public DateTimeOffset? FirstFactOperationDateStart { get; set; }
 
         /// <summary>
         /// <para>Дата окончания последней прогнозируемой операции</para>
         /// <para>Если скважина завершена, то дата окончания последней фактической операции</para>
         /// <para>Используется как прогноз окончания бурения</para>
         /// </summary>
-        public DateTime? LastPredictOperationDateEnd { get; set; }
+        public DateTimeOffset? LastPredictOperationDateEnd { get; set; }
 
         /// <summary>
         /// Рейсовая скорость проходки, последнего рейса
diff --git a/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs b/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs
index 4bf326e7..c4463a78 100644
--- a/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs
+++ b/AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs
@@ -288,8 +288,8 @@ public class OperationsStatService : IOperationsStatService
 
         var section = new StatOperationsDto
         {
-            Start = operations.FirstOrDefault()?.DateStart.ToRemoteDateTime(timezoneOffsetHours),
-            End = operations.Max(o => o.DateStart.ToRemoteDateTime(timezoneOffsetHours).AddHours(o.DurationHours)),
+            Start = operations.FirstOrDefault()?.DateStart.ToOffset(TimeSpan.FromHours(timezoneOffsetHours)),
+            End = operations.Max(o => o.DateStart.ToOffset(TimeSpan.FromHours(timezoneOffsetHours)).AddHours(o.DurationHours)),
             WellDepthStart = operations.Min(o => o.DepthStart),
             WellDepthEnd = operations.Max(o => o.DepthStart),
             Rop = CalcROP(operations),