From feb26232001c40a66efd223d565a252261514f7f Mon Sep 17 00:00:00 2001 From: "ai.astrakhantsev" Date: Mon, 27 Feb 2023 12:12:55 +0500 Subject: [PATCH] IDailyReportService, WellInfoService, WellInfoService --- AsbCloudApp/Services/IDailyReportService.cs | 2 +- AsbCloudInfrastructure/Repository/ScheduleRepository.cs | 4 +--- AsbCloudInfrastructure/Services/WellInfoService.cs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/AsbCloudApp/Services/IDailyReportService.cs b/AsbCloudApp/Services/IDailyReportService.cs index 1b8a29d9..333a8821 100644 --- a/AsbCloudApp/Services/IDailyReportService.cs +++ b/AsbCloudApp/Services/IDailyReportService.cs @@ -57,6 +57,6 @@ namespace AsbCloudApp.Services /// /// /// - Task MakeReportAsync(int idWell, DateTime date, CancellationToken token = default); + Task MakeReportAsync(int idWell, DateTime date, CancellationToken token = default); } } diff --git a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs index b43abe98..03c38cc7 100644 --- a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs +++ b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs @@ -10,7 +10,6 @@ using System.Threading.Tasks; namespace AsbCloudInfrastructure.Repository { -#nullable enable public class ScheduleRepository : CrudWellRelatedRepositoryBase, IScheduleRepository { private readonly IWellService wellService; @@ -21,7 +20,7 @@ namespace AsbCloudInfrastructure.Repository this.wellService = wellService; } - public async Task GetDrillerAsync(int idWell, DateTime workTime, CancellationToken token) + public async Task GetDrillerAsync(int idWell, DateTime workTime, CancellationToken token) { var hoursOffset = wellService.GetTimezone(idWell).Hours; var date = workTime.ToUtcDateTimeOffset(hoursOffset); @@ -64,5 +63,4 @@ namespace AsbCloudInfrastructure.Repository return dto; } } -#nullable disable } diff --git a/AsbCloudInfrastructure/Services/WellInfoService.cs b/AsbCloudInfrastructure/Services/WellInfoService.cs index b8b6128a..9b6986bf 100644 --- a/AsbCloudInfrastructure/Services/WellInfoService.cs +++ b/AsbCloudInfrastructure/Services/WellInfoService.cs @@ -97,7 +97,7 @@ namespace AsbCloudInfrastructure.Services var wellSubsystemStat = subsystemStat.FirstOrDefault(s => s.Well.Id == well.Id); double currentDepth = wellLastTelemetryInfo?.WellDepth - ?? wellLastFactSection?.Fact.WellDepthEnd + ?? wellLastFactSection?.Fact?.WellDepthEnd ?? 0d; var wellProcessMaps = processMaps