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

Правки - 3

Browse Source
This commit is contained in:
Olga Nemt 2024-02-14 13:12:25 +05:00
parent d5d97acb7d
commit 08e0a4fb38
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AsbCloudInfrastructure/Services/ProcessMaps/Report/ProcessMapReportDataSaubStatService.cs
View File

@ -107,7 +107,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
.Where(p => p.IdWellSectionType == idWellSectionType) .Where(p => p.IdWellSectionType == idWellSectionType)
.Where(p => p.DepthStart <= data.DepthStart) .Where(p => p.DepthStart <= data.DepthStart)
.Where(p => p.DepthEnd >= data.DepthStart) .Where(p => p.DepthEnd >= data.DepthStart)
//.Where(p => IsModeMatchOperationCategory(p.IdMode, data.IdCategory)) .Where(p => IsModeMatchOperationCategory(p.IdMode, data.IdCategory))
.WhereActualAtMoment(data.DateStart) .WhereActualAtMoment(data.DateStart)
.FirstOrDefault(); .FirstOrDefault();
@ -142,7 +142,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
.Where(c => c.Id == idWellSectionType) .Where(c => c.Id == idWellSectionType)
.FirstOrDefault()?.Caption ?? string.Empty; .FirstOrDefault()?.Caption ?? string.Empty;
var elem = CalcStat(processMapPlan, span, idWellSectionType, wellOperationCategoryName, wellSectionTypeName); var elem = CalcStat(processMapPlan, span, wellOperationCategoryName, wellSectionTypeName);
if (elem is not null) if (elem is not null)
list.Add(elem); list.Add(elem);
} }
@ -152,13 +152,12 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
private bool IsModeMatchOperationCategory(int idMode, int idCategory) private bool IsModeMatchOperationCategory(int idMode, int idCategory)
{ {
throw new NotImplementedException(); return (idMode == 1 && idCategory == 5003) || (idMode == 2 && idCategory == 5002);
} }
private ProcessMapReportDataSaubStatDto? CalcStat( private ProcessMapReportDataSaubStatDto? CalcStat(
ProcessMapPlanDrillingDto? processMapPlanFilteredByDepth, ProcessMapPlanDrillingDto? processMapPlanFilteredByDepth,
Span<DataSaubStatDto> span, Span<DataSaubStatDto> span,
int idWellSectionType,
string wellOperationCategoryName, string wellOperationCategoryName,
string wellSectionTypeName string wellSectionTypeName
) )
@ -226,7 +225,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
}, },
Rop = new PlanFactDto<double?> Rop = new PlanFactDto<double?>
{ {
//Plan = CalcRopPlan(processMapPlanFilteredByDepth), Plan = processMapPlanFilteredByDepth?.RopPlan,
Fact = deltaDepth / aggregatedValues.DrilledTime Fact = deltaDepth / aggregatedValues.DrilledTime
}, },
}; };