From e8225a375e6a8876c5130c053d581a66869a32be Mon Sep 17 00:00:00 2001
From: eugeniy_ivanov <ea.ivanov@digitaldrilling.ru>
Date: Thu, 3 Nov 2022 16:03:20 +0500
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=BA=D0=B8=D1=85=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0?=
 =?UTF-8?q?=D1=82=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Services/IDetectedOperationService.cs             | 2 +-
 .../Services/DetectOperations/DetectedOperationService.cs     | 2 +-
 .../Services/Subsystems/SubsystemOperationTimeService.cs      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AsbCloudApp/Services/IDetectedOperationService.cs b/AsbCloudApp/Services/IDetectedOperationService.cs
index 7076b472..cb14cc9c 100644
--- a/AsbCloudApp/Services/IDetectedOperationService.cs
+++ b/AsbCloudApp/Services/IDetectedOperationService.cs
@@ -48,7 +48,7 @@ namespace AsbCloudApp.Services
         /// <param name="ltDate"></param>
         /// <param name="token"></param>        
         /// <returns>кортеж - ид телеметрии, интервалы глубины забоя (ротор,слайд) </returns>
-        Task<IEnumerable<(int idTelemetry,double depthIntervalRotor, double depthIntervalSlide)>?> GetDepthIntervalAllOperationsAsync(IEnumerable<int> telemetryIds,DateTimeOffset gtDate, DateTimeOffset ltDate, CancellationToken token);
+        Task<IEnumerable<(int idTelemetry,double depthIntervalRotor, double depthIntervalSlide)>?> GetDepthIntervalAllOperationsAsync(IEnumerable<int?> telemetryIds,DateTimeOffset gtDate, DateTimeOffset ltDate, CancellationToken token);
 
         /// <summary>
         /// Удалить операции
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
index f163d4c1..f5816b1b 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
@@ -84,7 +84,7 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
             return dtos;
         }        
 
-        public async Task<IEnumerable<(int idTelemetry, double depthIntervalRotor, double depthIntervalSlide)>?> GetDepthIntervalAllOperationsAsync(IEnumerable<int> telemetryIds, DateTimeOffset gtDate, DateTimeOffset ltDate, CancellationToken token)
+        public async Task<IEnumerable<(int idTelemetry, double depthIntervalRotor, double depthIntervalSlide)>?> GetDepthIntervalAllOperationsAsync(IEnumerable<int?> telemetryIds, DateTimeOffset gtDate, DateTimeOffset ltDate, CancellationToken token)
         {
             var query = db.Set<DetectedOperation>()
                 .Include(o => o.OperationCategory)
diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
index 2ee9ea00..7a8a32fe 100644
--- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
+++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
@@ -216,12 +216,12 @@ namespace AsbCloudInfrastructure.Services.Subsystems
             }
             if (ltDate is not null)
             {
-                beginUTC = ltDate.Value.ToUtcDateTimeOffset(firstWell.Timezone.Hours);
+                endUTC = ltDate.Value.ToUtcDateTimeOffset(firstWell.Timezone.Hours);
             }
             query = query.Where(d => d.DateStart >= beginUTC);           
             query = query.Where(o => o.DateEnd <= endUTC);            
 
-            var depthIntervals = await detectedOperationService.GetDepthIntervalAllOperationsAsync(beginUTC, endUTC, token);            
+            var depthIntervals = await detectedOperationService.GetDepthIntervalAllOperationsAsync(telemetryIds, beginUTC, endUTC, token);           
             var result = new List<SubsystemActiveWellStatDto>();            
             var subsystemsOperationTime = await query.ToListAsync(token);
             var groupingSubsystemsOperationTime = subsystemsOperationTime.GroupBy(g => g.IdTelemetry);