forked from ddrilling/AsbCloudServer
format WellCompositeOperationService
This commit is contained in:
parent
c3af911369
commit
f5c4f63b2f
@ -11,10 +11,10 @@ using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace AsbCloudInfrastructure.Services
|
||||
namespace AsbCloudInfrastructure.Services;
|
||||
|
||||
public class WellCompositeOperationService : IWellCompositeOperationService
|
||||
{
|
||||
public class WellCompositeOperationService : IWellCompositeOperationService
|
||||
{
|
||||
private readonly ICrudRepository<WellSectionTypeDto> wellSectionTypeRepository;
|
||||
private readonly IWellOperationCategoryRepository wellOperationCategoryRepository;
|
||||
private readonly IWellOperationRepository wellOperationRepository;
|
||||
@ -124,8 +124,6 @@ namespace AsbCloudInfrastructure.Services
|
||||
{ (6, 5003) }
|
||||
};
|
||||
|
||||
|
||||
|
||||
public WellCompositeOperationService(
|
||||
ICrudRepository<WellSectionTypeDto> wellSectionTypeRepository,
|
||||
IWellOperationCategoryRepository wellOperationCategoryRepository,
|
||||
@ -195,15 +193,15 @@ namespace AsbCloudInfrastructure.Services
|
||||
.First();
|
||||
|
||||
compositeOperation.IdWell = 0;
|
||||
compositeOperation.Day = compositeDay + compositeOperation.DurationHours;
|
||||
|
||||
if (compositeDepth > compositeOperation.DepthStart)
|
||||
compositeOperation.DepthStart = compositeDepth;
|
||||
compositeDepth = compositeOperation.DepthStart;
|
||||
|
||||
compositeDay += compositeOperation.DurationHours;
|
||||
compositeOperation.Day = compositeDay;
|
||||
|
||||
compositeOperations.Add(compositeOperation);
|
||||
|
||||
compositeDepth = compositeOperation.DepthStart;
|
||||
compositeDay = compositeOperation.Day;
|
||||
}
|
||||
|
||||
var groupedByWellOperations = operations
|
||||
@ -212,11 +210,7 @@ namespace AsbCloudInfrastructure.Services
|
||||
.Select(o => new WellCompositeOperationSourceDto()
|
||||
{
|
||||
Operations = o.Value,
|
||||
Well = new WellDto()
|
||||
{
|
||||
Id = o.Key,
|
||||
Caption = wellsDict[o.Key].Caption,
|
||||
}
|
||||
Well = wellsDict[o.Key],
|
||||
});
|
||||
|
||||
result.WellOperationsComposite = compositeOperations;
|
||||
@ -245,5 +239,4 @@ namespace AsbCloudInfrastructure.Services
|
||||
|
||||
return newDto;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user