Merge pull request 'ГГД - Добавить в справочник новые операции' (#248) from feature/#26940800-add-some-well-categories into dev

Reviewed-on: http://test.digitaldrilling.ru:8080/DDrilling/AsbCloudServer/pulls/248

AsbCloudApp/Repositories/IWellOperationCategoryRepository.cs

@@ -12,6 +12,6 @@ namespace AsbCloudApp.Repositories
         /// список названий операций
         /// </summary>
         /// <returns></returns>
-        IEnumerable<WellOperationCategoryDto> Get(bool includeParents);
+        IEnumerable<WellOperationCategoryDto> Get(bool includeParents, bool includeHidden = true);
     }
 }

AsbCloudDb/Model/WellOperationCategory.cs

@@ -39,6 +39,11 @@ namespace AsbCloudDb.Model
         /// </summary>
         public const int IdNonProductiveTime = 3005;
 
+        /// <summary>
+        /// Заключительные работы
+        /// </summary>
+        public const int IdFinalWorks = 3006;
+
         /// <summary>
         /// КНБК
         /// </summary>
@@ -129,6 +134,11 @@ namespace AsbCloudDb.Model
         /// </summary>
         public const int IdOperationsNotIncludedGGD = 4017;
 
+        /// <summary>
+        /// Заключительные операции
+        /// </summary>
+        public const int IdFinalOperations = 4019;
+
         /// <summary>
         /// Разборка КНБК
         /// </summary>
@@ -240,6 +250,7 @@ namespace AsbCloudDb.Model
             new() { Id = IdGFR, Name = "ГФР", KeyValueName = "dT", KeyValueUnits = "мин" },
             new() { Id = IdAuxiliaryOperations, Name = "Вспомогательные операции", KeyValueName = "dT", KeyValueUnits = "мин" },
             new() { Id = IdNonProductiveTime, Name = "Непроизводительное время (НПВ)", KeyValueName = "dT", KeyValueUnits = "мин" },
+            new() { Id = IdFinalWorks, Name = "Заключительные работы", KeyValueName = "dT", KeyValueUnits = "мин" },
         };
 
         /// <summary>
@@ -265,6 +276,7 @@ namespace AsbCloudDb.Model
             new () {Id = IdEmergencyWork, IdParent = 3005, Name = "Аварийные работы",  KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = IdComplication, IdParent = 3005, Name = "Осложнение",    KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = IdOperationsNotIncludedGGD, IdParent = 3005, Name = "Незаложенные в ГГД операции",   KeyValueName = "dT", KeyValueUnits = "мин" },
+            new () {Id = IdFinalOperations, IdParent = IdFinalWorks, Name = "Заключительные операции",   KeyValueName = "dT", KeyValueUnits = "мин" },
         };
 
         /// <summary>
@@ -273,8 +285,8 @@ namespace AsbCloudDb.Model
         public static WellOperationCategory[] WorkCategories { get; } = new WellOperationCategory[]{
              new () {Id = IdBhaDisassembly, IdParent = 4000, Name = "Разборка КНБК", KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = IdBhaAssembly, IdParent = 4000, Name = "Сборка КНБК", KeyValueName = "dT", KeyValueUnits = "мин" },
-            new () {Id = IdSlide, IdParent = 4001, Name = "Бурение слайдом", KeyValueName = "МСП", KeyValueUnits = "м/ч" },
-            new () {Id = IdRotor, IdParent = 4001, Name = "Бурение ротором", KeyValueName = "МСП", KeyValueUnits = "м/ч" },
+            new () {Id = IdSlide, IsHidden = true, IdParent = 4001, Name = "Бурение слайдом", KeyValueName = "МСП", KeyValueUnits = "м/ч" },
+            new () {Id = IdRotor, IsHidden = true, IdParent = 4001, Name = "Бурение ротором", KeyValueName = "МСП", KeyValueUnits = "м/ч" },
             new () {Id = IdStaticSurveying, IdParent = 4002, Name = "Замер ЗТС (запись MWD)", KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = IdFlashingBeforeConnection, IdParent = 4003, Name = "Промывка перед наращиванием", KeyValueName = "dT", KeyValueUnits = "мин" },
             new () {Id = 5006, IdParent = 4003, Name = "Проработка во время бурения", KeyValueName = "dT", KeyValueUnits = "мин" },
@@ -381,7 +393,12 @@ namespace AsbCloudDb.Model
             new () {Id = 5109, IdParent = 4018, Name = "Стыковка стингера с хвостовиком основного ствола", KeyValueName = "dT", KeyValueUnits = "мин"},
             new () {Id = 5110, IdParent = 4018, Name = "Ориентирование и установка стыковочного узла хвостовика", KeyValueName = "dT", KeyValueUnits = "мин"},
             new () {Id = 5111, IdParent = 4001, Name = "Бурение с отбором керна", KeyValueName = "МСП", KeyValueUnits = "м/ч"},
-            new () {Id = 5112, IdParent = 4018, Name = "Работа пакером в обсадной колонне", KeyValueName = "dT", KeyValueUnits = "мин"}
+            new () {Id = 5112, IdParent = 4018, Name = "Работа пакером в обсадной колонне", KeyValueName = "dT", KeyValueUnits = "мин"},
+            new () {Id = 5113, IdParent = 4001, Name = "Бурение", KeyValueName = "МСП", KeyValueUnits = "м/ч"},
+            new () {Id = 5114, IdParent = 4013, Name = "ТО оборудования", KeyValueName = "dT", KeyValueUnits = "мин"},
+            new () {Id = 5115, IdParent = IdFinalOperations, Name = "Спуск НКТ", KeyValueName = "dT", KeyValueUnits = "мин"},
+            new () {Id = 5116, IdParent = IdAuxiliaryWork, Name = "Вырезка окна", KeyValueName = "dT", KeyValueUnits = "мин"},
+            new () {Id = 5117, IdParent = IdAuxiliaryWork, Name = "Расширение ствола", KeyValueName = "dT", KeyValueUnits = "мин"},
         };
         #endregion 
 
@@ -401,6 +418,8 @@ namespace AsbCloudDb.Model
         [Column("key_value_units"), Comment("Единицы измерения ключевого показателя операции"), StringLength(16)]
         public string? KeyValueUnits { get; set; }
 
+        public bool IsHidden { get; set; } = false;
+
         [JsonIgnore]
         [ForeignKey(nameof(IdParent))]
         public virtual WellOperationCategory? Parent { get; set; } = null!;

AsbCloudInfrastructure/Repository/WellOperationCategoryRepository.cs

@@ -19,11 +19,14 @@ public class WellOperationCategoryRepository : IWellOperationCategoryRepository
         this.memoryCache = memoryCache;
     }
 
-    public IEnumerable<WellOperationCategoryDto> Get(bool includeParents)
+    public IEnumerable<WellOperationCategoryDto> Get(bool includeParents, bool includeHidden = true)
     {
         var categories = memoryCache
             .GetOrCreateBasic(db.Set<WellOperationCategory>());
 
+        if (!includeHidden)
+            categories = categories.Where(o => o.IsHidden == false);
+
         if (!includeParents)
         {
             var parentIds = categories

AsbCloudWebApi/Controllers/WellOperationController.cs

@@ -172,7 +172,7 @@ public class WellOperationController : ControllerBase
     [ProducesResponseType(typeof(IEnumerable<WellOperationCategoryDto>), StatusCodes.Status200OK)]
     public IActionResult GetCategories(bool includeParents = true)
     {
-		var result = wellOperationCategoryRepository.Get(includeParents);
+        var result = wellOperationCategoryRepository.Get(includeParents, false);
         return Ok(result);
     }