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

Фильтрация по категориям опреации: в ГГД выводятся только те, у которого isHidden = false

Browse Source
This commit is contained in:
Olga Nemt 2024-04-10 15:05:15 +05:00
parent a91d95bc2e
commit b5369c4363
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudApp/Repositories/IWellOperationCategoryRepository.cs
View File

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

4
AsbCloudInfrastructure/Repository/WellOperationCategoryRepository.cs
View File

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

BIN
AsbCloudInfrastructure/Services/WellOperations/Templates/WellOperationPlanTemplate.xlsx
View File

Binary file not shown.

2
AsbCloudWebApi/Controllers/WellOperationController.cs
View File

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