From f8c26f18354751706debc2c22cc6fcfcabded3c6 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Fri, 10 Mar 2023 10:25:10 +0500 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=84=D0=B8=D0=BB?= =?UTF-8?q?=D1=8C=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D1=84=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D1=85=20=D0=BE=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Requests/WellOperationRequest.cs | 4 ++-- .../Repository/WellOperationRepository.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AsbCloudApp/Requests/WellOperationRequest.cs b/AsbCloudApp/Requests/WellOperationRequest.cs index eaa91790..63c31c18 100644 --- a/AsbCloudApp/Requests/WellOperationRequest.cs +++ b/AsbCloudApp/Requests/WellOperationRequest.cs @@ -16,7 +16,7 @@ namespace AsbCloudApp.Requests /// /// фильтр по дате окончания операции /// - public DateTime? LeDate { get; set; } + public DateTime? LtDate { get; set; } /// /// фильтр по максимальной глубине скважины @@ -71,7 +71,7 @@ namespace AsbCloudApp.Requests this.GeDepth = request.GeDepth; this.LeDepth = request.LeDepth; this.GeDate = request.GeDate; - this.LeDate = request.LeDate; + this.LtDate = request.LtDate; this.OperationCategoryIds = request.OperationCategoryIds; this.OperationType = request.OperationType; diff --git a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs index 928a5fde..af14d6b8 100644 --- a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs +++ b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs @@ -332,10 +332,10 @@ namespace AsbCloudInfrastructure.Repository query = query.Where(e => e.DateStart >= geDateOffset); } - if (request.LeDate.HasValue) + if (request.LtDate.HasValue) { - var leDateOffset = request.LeDate.Value.ToUtcDateTimeOffset(timezone.Hours); - query = query.Where(e => e.DateStart <= leDateOffset); + var ltDateOffset = request.LtDate.Value.ToUtcDateTimeOffset(timezone.Hours); + query = query.Where(e => e.DateStart < ltDateOffset); } var currentWellOperations = db.WellOperations