diff --git a/AsbCloudApp/Data/WellMapInfoDto.cs b/AsbCloudApp/Data/WellMapInfoDto.cs index 5f6ca5a7..a677a1e3 100644 --- a/AsbCloudApp/Data/WellMapInfoDto.cs +++ b/AsbCloudApp/Data/WellMapInfoDto.cs @@ -1,5 +1,7 @@ using AsbCloudApp.Data.SAUB; using System; +using System.Collections.Generic; +using System.Linq; namespace AsbCloudApp.Data { @@ -37,6 +39,11 @@ namespace AsbCloudApp.Data /// Дата полседнего получения данных от станции контроля параметров цементирования (СКЦ) /// public DateTime? LastDataCpmsDate { get; set; } + + /// + /// Компании + /// + public IEnumerable Companies { get; set; } = Enumerable.Empty(); } /// diff --git a/AsbCloudInfrastructure/Services/WellService.cs b/AsbCloudInfrastructure/Services/WellService.cs index 6a805560..befa8851 100644 --- a/AsbCloudInfrastructure/Services/WellService.cs +++ b/AsbCloudInfrastructure/Services/WellService.cs @@ -97,6 +97,7 @@ namespace AsbCloudInfrastructure.Services dto ??= well.Adapt(); dto.Latitude ??= gCluster.Key.Latitude ?? gDeposit.Key.Latitude; dto.Longitude ??= gCluster.Key.Longitude ?? gDeposit.Key.Longitude; + dto.Companies = well.RelationCompaniesWells.Select(r => Convert(r.Company)); return dto; }), }),