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

Merge branch 'dev' into feature/refactoring_api_route

Browse Source
This commit is contained in:
Степанов Дмитрий Александрович 2023-08-07 09:10:07 +05:00
commit b3ed280d8f
4 changed files with 571 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudApp/Data/StatWellDto.cs
View File

@ -53,8 +53,8 @@ namespace AsbCloudApp.Data
public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>(); public IEnumerable<CompanyDto> Companies { get; set; } = Enumerable.Empty<CompanyDto>();
/// <summary> /// <summary>
/// Отставание от ГГД, дней /// Отставание от ГГД, проценты
/// </summary> /// </summary>
public double TvdLagDays { get; set; } = 0; public double? TvdLagPercent { get; set; }
} }
} }

5
AsbCloudApp/Data/WellMapInfoDto.cs
View File

@ -95,9 +95,8 @@ namespace AsbCloudApp.Data
public PlanFactDto<double?> WellDepth { get; set; } = null!; public PlanFactDto<double?> WellDepth { get; set; } = null!;
/// <summary> /// <summary>
/// Отставание от ГГД, дни /// Отставание от ГГД, проценты
/// </summary> /// </summary>
public double TvdLagDays { get; set; } public double TvdLagPercent { get; set; }
} }
} }

5
AsbCloudInfrastructure/Services/WellInfoService.cs
View File

@ -138,8 +138,7 @@ namespace AsbCloudInfrastructure.Services
wellMapInfo.FirstFactOperationDateStart = wellOperationsStat?.Total.Fact?.Start wellMapInfo.FirstFactOperationDateStart = wellOperationsStat?.Total.Fact?.Start
?? wellOperationsStat?.Total.Plan?.Start; ?? wellOperationsStat?.Total.Plan?.Start;
wellMapInfo.LastPredictOperationDateEnd = wellOperationsStat?.Total.Plan?.End? wellMapInfo.LastPredictOperationDateEnd = wellOperationsStat?.Total.Plan?.End;
.AddDays(wellOperationsStat?.TvdLagDays ?? 0d);
wellMapInfo.WellDepth = new() wellMapInfo.WellDepth = new()
{ {
@ -163,7 +162,7 @@ namespace AsbCloudInfrastructure.Services
wellMapInfo.SaubUsage = wellSubsystemStat?.SubsystemAKB?.KUsage ?? 0d; wellMapInfo.SaubUsage = wellSubsystemStat?.SubsystemAKB?.KUsage ?? 0d;
wellMapInfo.SpinUsage = wellSubsystemStat?.SubsystemSpinMaster?.KUsage ?? 0d; wellMapInfo.SpinUsage = wellSubsystemStat?.SubsystemSpinMaster?.KUsage ?? 0d;
wellMapInfo.TorqueKUsage = wellSubsystemStat?.SubsystemTorqueMaster?.KUsage ?? 0d; wellMapInfo.TorqueKUsage = wellSubsystemStat?.SubsystemTorqueMaster?.KUsage ?? 0d;
wellMapInfo.TvdLagDays = wellOperationsStat?.TvdLagDays ?? 0d; wellMapInfo.TvdLagPercent = wellOperationsStat?.TvdLagPercent ?? 0d;
wellMapInfo.IdsCompanies = well.Companies.Select(c => c.Id); wellMapInfo.IdsCompanies = well.Companies.Select(c => c.Id);
return wellMapInfo; return wellMapInfo;

1091
AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs
View File

File diff suppressed because it is too large Load Diff