diff --git a/AsbCloudApp/Requests/WellOperationRequest.cs b/AsbCloudApp/Requests/WellOperationRequest.cs index 3296c4ad..1d190018 100644 --- a/AsbCloudApp/Requests/WellOperationRequest.cs +++ b/AsbCloudApp/Requests/WellOperationRequest.cs @@ -108,10 +108,5 @@ namespace AsbCloudApp.Requests /// ids скважин /// public IEnumerable IdsWell { get; set; } = null!; - - /// - /// Тип 0 = План или 1 = Факт - /// - public int IdType { get; set; } } } diff --git a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs index aa0d28ce..329d2502 100644 --- a/AsbCloudInfrastructure/Repository/WellOperationRepository.cs +++ b/AsbCloudInfrastructure/Repository/WellOperationRepository.cs @@ -396,7 +396,6 @@ public class WellOperationRepository : IWellOperationRepository .Include(s => s.OperationCategory) .Where(o => o.IdWell == request.IdWell); - if (request.OperationType.HasValue) query = query.Where(e => e.IdType == request.OperationType.Value); @@ -431,6 +430,7 @@ public class WellOperationRepository : IWellOperationRepository .Where(subOp => subOp.IdType == 1) .Where(subOp => WellOperationCategory.NonProductiveTimeSubIds.Contains(subOp.IdCategory)); + // TODO: Вынести query.Select из метода BuildQuery var dtos = query.Select(o => new WellOperationDto { Id = o.Id, @@ -493,7 +493,7 @@ public class WellOperationRepository : IWellOperationRepository { var query = db.WellOperations .Where(o => request.IdsWell.Contains(o.IdWell)) - .Where(o => request.IdType == o.IdType); + .Where(o => request.OperationType == o.IdType); if (request.SectionTypeIds?.Any() == true) query = query.Where(o => request.SectionTypeIds.Contains(o.IdWellSectionType)); @@ -501,6 +501,7 @@ public class WellOperationRepository : IWellOperationRepository if (request.OperationCategoryIds?.Any() == true) query = query.Where(o => request.OperationCategoryIds.Contains(o.IdCategory)); + // TODO: Вынести query.Select из метода BuildQuery var dtos = query.Select(o => new WellOperationDataDto { DepthStart = o.DepthStart, diff --git a/AsbCloudInfrastructure/Services/WellCompositeOperationService.cs b/AsbCloudInfrastructure/Services/WellCompositeOperationService.cs index 4730352d..6ba97ea0 100644 --- a/AsbCloudInfrastructure/Services/WellCompositeOperationService.cs +++ b/AsbCloudInfrastructure/Services/WellCompositeOperationService.cs @@ -149,7 +149,7 @@ namespace AsbCloudInfrastructure.Services IdsWell = idsWells, OperationCategoryIds = usedCategories, SectionTypeIds = idsWellSectionTypes, - IdType = WellOperation.IdOperationTypeFact + OperationType = WellOperation.IdOperationTypeFact }; var operations = await wellOperationRepository.GetAsync(wellOperationRequest, token); @@ -189,7 +189,6 @@ namespace AsbCloudInfrastructure.Services compositeDepth = composite.DepthStart; - var resultItem = aggreagtedByWell.ToDictionary(o => o.IdWell); resultItem.Add(0, composite); @@ -198,7 +197,7 @@ namespace AsbCloudInfrastructure.Services return wellOperationsWithComposite; } - private WellOperationDataDto UpdateIdWellSectionAndIdCategory( + private static WellOperationDataDto UpdateIdWellSectionAndIdCategory( WellOperationDataDto dto, Dictionary sectionTypes, Dictionary operationCategories)