Мини-правки

This commit is contained in:
Olga Nemt 2024-02-14 10:51:20 +05:00
parent f9d95c4431
commit df0b3555b3

View File

@ -253,7 +253,7 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
{ {
var diffDepth = span[i].DepthEnd - span[i].DepthStart; var diffDepth = span[i].DepthEnd - span[i].DepthStart;
sumPressure += diffDepth * ((span[i].PressureIdle ?? 0) - span[i].Pressure); sumPressure += diffDepth * (span[i].Pressure - (span[i].PressureIdle ?? 0.0));
sumAxialLoadSp += diffDepth * (span[i].AxialLoadSp ?? 0); sumAxialLoadSp += diffDepth * (span[i].AxialLoadSp ?? 0);
sumAxialLoad += diffDepth * span[i].AxialLoad; sumAxialLoad += diffDepth * span[i].AxialLoad;
sumRotorTorqueSp += diffDepth * (span[i].RotorTorqueSp ?? 0); sumRotorTorqueSp += diffDepth * (span[i].RotorTorqueSp ?? 0);
@ -265,13 +265,13 @@ namespace AsbCloudInfrastructure.Services.ProcessMaps.Report
maxRotorSpeed = span[i].RotorSpeed > maxRotorSpeed ? span[i].RotorSpeed : maxRotorSpeed; maxRotorSpeed = span[i].RotorSpeed > maxRotorSpeed ? span[i].RotorSpeed : maxRotorSpeed;
if (span[i].IdFeedRegulator == LimitingParameterDto.Pressure) if (span[i].IdFeedRegulator == LimitingParameterDto.Pressure)
sumDiffDepthByPressure += span[i].DepthEnd - span[i].DepthStart; sumDiffDepthByPressure += diffDepth;
if (span[i].IdFeedRegulator == LimitingParameterDto.AxialLoad) if (span[i].IdFeedRegulator == LimitingParameterDto.AxialLoad)
sumDiffDepthByAxialLoad += span[i].DepthEnd - span[i].DepthStart; sumDiffDepthByAxialLoad += diffDepth;
if (span[i].IdFeedRegulator == LimitingParameterDto.RotorTorque) if (span[i].IdFeedRegulator == LimitingParameterDto.RotorTorque)
sumDiffDepthByRotorTorque += span[i].DepthEnd - span[i].DepthStart; sumDiffDepthByRotorTorque += diffDepth;
if (span[i].IdFeedRegulator == LimitingParameterDto.RopPlan) if (span[i].IdFeedRegulator == LimitingParameterDto.RopPlan)
sumDiffDepthByRopPlan += span[i].DepthEnd - span[i].DepthStart; sumDiffDepthByRopPlan += diffDepth;
diffDepthTotal += diffDepth; diffDepthTotal += diffDepth;
drilledTime += (span[i].DateEnd - span[i].DateStart).TotalHours; drilledTime += (span[i].DateEnd - span[i].DateStart).TotalHours;