Замена типа дат в WellOperationRequestBase с DateTime на DateTimeOffset

AsbCloudApp/Requests/WellOperationRequest.cs

@@ -11,12 +11,12 @@ namespace AsbCloudApp.Requests
         /// <summary>
         /// фильтр по дате начала операции
         /// </summary>
-        public DateTime? GeDate { get; set; }
+        public DateTimeOffset? GeDate { get; set; }
 
         /// <summary>
         /// фильтр по дате окончания операции
         /// </summary>
-        public DateTime? LtDate { get; set; }
+        public DateTimeOffset? LeDate { get; set; }
 
         /// <summary>
         /// фильтр. Больше или равно глубины скважины на начало операции. 
@@ -60,7 +60,7 @@ namespace AsbCloudApp.Requests
             GeDepth = request.GeDepth;
             LeDepth = request.LeDepth;
             GeDate = request.GeDate;
-            LtDate = request.LtDate;
+            LeDate = request.LeDate;
 
             OperationCategoryIds = request.OperationCategoryIds;
             OperationType = request.OperationType;

AsbCloudInfrastructure/Repository/WellOperationRepository.cs

@@ -57,7 +57,7 @@ public class WellOperationRepository : IWellOperationRepository
             .ToArrayAsync(token);
 
         var dateLastAssosiatedPlanOperation = await GetDateLastAssosiatedPlanOperationAsync(idWell, currentDate, timezone.Hours, token);
-        
+
         var result = new WellOperationPlanDto()
         {
             WellOperationsPlan = dtos.Select(Convert),
@@ -199,9 +199,9 @@ public class WellOperationRepository : IWellOperationRepository
     {
         var query = BuildQuery(request)
             .AsNoTracking();
-        
+
         var dtos = await query.ToArrayAsync(token);
-        
+
         return dtos.Select(Convert);
     }
 
@@ -222,7 +222,7 @@ public class WellOperationRepository : IWellOperationRepository
         CancellationToken token)
     {
         var query = BuildQuery(request);
-        
+
         var result = new PaginationContainer<WellOperationDto>
         {
             Skip = request.Skip ?? 0,
@@ -390,7 +390,7 @@ public class WellOperationRepository : IWellOperationRepository
     {
         var timezone = wellService.GetTimezone(request.IdWell);
         var timeZoneOffset = timezone.Hours;
-        
+
         var query = db.WellOperations
             .Include(s => s.WellSectionType)
             .Include(s => s.OperationCategory)
@@ -413,14 +413,14 @@ public class WellOperationRepository : IWellOperationRepository
 
         if (request.GeDate.HasValue)
         {
-            var geDateOffset = request.GeDate.Value.ToUtcDateTimeOffset(timeZoneOffset);
+            //var geDateOffset = request.GeDate.Value.ToUtcDateTimeOffset(timeZoneOffset);
-            query = query.Where(e => e.DateStart >= geDateOffset);
+            query = query.Where(e => e.DateStart >= request.GeDate);
         }
 
-        if (request.LtDate.HasValue)
+        if (request.LeDate.HasValue)
         {
-            var ltDateOffset = request.LtDate.Value.ToUtcDateTimeOffset(timeZoneOffset);
+            //var leDateOffset = request.LeDate.Value.ToUtcDateTimeOffset(timeZoneOffset);
-            query = query.Where(e => e.DateStart < ltDateOffset);
+            query = query.Where(e => e.DateStart <= request.LeDate);
         }
 
         var currentWellOperations = db.WellOperations
@@ -468,7 +468,7 @@ public class WellOperationRepository : IWellOperationRepository
         {
             dtos = dtos.SortBy(request.SortFields);
         }
-        
+
         dtos = dtos
             .OrderBy(e => e.DateStart)
             .ThenBy(e => e.DepthEnd)
@@ -533,7 +533,7 @@ public class WellOperationRepository : IWellOperationRepository
         var timezoneOffset = TimeSpan.FromHours(timezone.Hours);
 
         var dtoWithRemoteDateTime = dto.Adapt<WellOperationDto>();
-        
+
         dtoWithRemoteDateTime.DateStart = dto.DateStart.ToOffset(TimeSpan.FromHours(timezoneOffset.Hours));
         dtoWithRemoteDateTime.LastUpdateDate = dto.LastUpdateDate?.ToOffset(TimeSpan.FromHours(timezoneOffset.Hours));
 
@@ -605,11 +605,11 @@ public class WellOperationRepository : IWellOperationRepository
             var geDateUtc = geDate.Value.ToUniversalTime();
             query = query.Where(e => e.DateStart >= geDateUtc);
         }
-            
+
         var groups = await query
             .GroupBy(o => new { o.IdWell, o.IdType })
             .Select(g => new{ 
-                MaxDate = g.Max(o => o.DateStart), 
+                MaxDate = g.Max(o => o.DateStart),
                 g.Key.IdWell,
                 g.Key.IdType,
             })

AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs

@@ -114,7 +114,7 @@ public class DailyReportService : IDailyReportService
 			IdWell = idWell,
 			OperationType = WellOperation.IdOperationTypeFact,
 			GeDate = geDate,
-			LtDate = ltDate
+			LeDate = ltDate
 		};
 
 		var factWellOperations = (await wellOperationRepository.GetAsync(factOperationRequest, cancellationToken))
@@ -191,7 +191,7 @@ public class DailyReportService : IDailyReportService
 			IdWell = idWell,
 			OperationType = WellOperation.IdOperationTypeFact,
 			GeDate = geDateFactWellOperation,
-			LtDate = ltDateFactWellOperation
+			LeDate = ltDateFactWellOperation
 		};
 
 		var factWellOperations = await wellOperationRepository.GetAsync(factWellOperationRequest, cancellationToken);