on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

фикс фильтрации фактических операций

Browse Source
This commit is contained in:
Olga Nemt 2023-03-10 10:25:10 +05:00
parent 2dd04d4037
commit f8c26f1835
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudApp/Requests/WellOperationRequest.cs
View File

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

6
AsbCloudInfrastructure/Repository/WellOperationRepository.cs
View File

@ -332,10 +332,10 @@ namespace AsbCloudInfrastructure.Repository
query = query.Where(e => e.DateStart >= geDateOffset); query = query.Where(e => e.DateStart >= geDateOffset);
} }
if (request.LeDate.HasValue) if (request.LtDate.HasValue)
{ {
var leDateOffset = request.LeDate.Value.ToUtcDateTimeOffset(timezone.Hours); var ltDateOffset = request.LtDate.Value.ToUtcDateTimeOffset(timezone.Hours);
query = query.Where(e => e.DateStart <= leDateOffset); query = query.Where(e => e.DateStart < ltDateOffset);
} }
var currentWellOperations = db.WellOperations var currentWellOperations = db.WellOperations