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

format WellCompositeOperationService

Browse Source
This commit is contained in:
ngfrolov 2024-04-17 16:23:36 +05:00
parent c3af911369
commit f5c4f63b2f
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
1 changed files with 208 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
AsbCloudInfrastructure/Services/WellCompositeOperationService.cs
View File

@ -11,8 +11,8 @@ using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; 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 ICrudRepository<WellSectionTypeDto> wellSectionTypeRepository;
@ -124,8 +124,6 @@ namespace AsbCloudInfrastructure.Services
{ (6, 5003) } { (6, 5003) }
}; };
public WellCompositeOperationService( public WellCompositeOperationService(
ICrudRepository<WellSectionTypeDto> wellSectionTypeRepository, ICrudRepository<WellSectionTypeDto> wellSectionTypeRepository,
IWellOperationCategoryRepository wellOperationCategoryRepository, IWellOperationCategoryRepository wellOperationCategoryRepository,
@ -195,15 +193,15 @@ namespace AsbCloudInfrastructure.Services
.First(); .First();
compositeOperation.IdWell = 0; compositeOperation.IdWell = 0;
compositeOperation.Day = compositeDay + compositeOperation.DurationHours;
if (compositeDepth > compositeOperation.DepthStart) if (compositeDepth > compositeOperation.DepthStart)
compositeOperation.DepthStart = compositeDepth; compositeOperation.DepthStart = compositeDepth;
compositeDepth = compositeOperation.DepthStart;
compositeDay += compositeOperation.DurationHours;
compositeOperation.Day = compositeDay;
compositeOperations.Add(compositeOperation); compositeOperations.Add(compositeOperation);
compositeDepth = compositeOperation.DepthStart;
compositeDay = compositeOperation.Day;
} }
var groupedByWellOperations = operations var groupedByWellOperations = operations
@ -212,11 +210,7 @@ namespace AsbCloudInfrastructure.Services
.Select(o => new WellCompositeOperationSourceDto() .Select(o => new WellCompositeOperationSourceDto()
{ {
Operations = o.Value, Operations = o.Value,
Well = new WellDto() Well = wellsDict[o.Key],
{
Id = o.Key,
Caption = wellsDict[o.Key].Caption,
}
}); });
result.WellOperationsComposite = compositeOperations; result.WellOperationsComposite = compositeOperations;
@ -246,4 +240,3 @@ namespace AsbCloudInfrastructure.Services
return newDto; return newDto;
} }
} }
}