From 71c300716828318651dc4a80666b248c67e478b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=82=D0=B5=D0=BF=D0=B0=D0=BD=D0=BE=D0=B2=20=D0=94?= =?UTF-8?q?=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Thu, 16 Nov 2023 10:45:44 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=81=D0=BB=D0=B5=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Переименовал свойство в SubsystemBlock 2. Добавил сортировку по умолчанию в метод получения списка суточных отчётов --- .../Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs | 2 +- .../Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs | 2 +- AsbCloudInfrastructure/Repository/DailyReportRepository.cs | 4 ++++ .../Services/DailyReport/DailyReportExportService.cs | 4 ++-- AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs b/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs index 7a3a690a..605b8bdf 100644 --- a/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs +++ b/AsbCloudApp/Data/DailyReport/Blocks/Subsystems/SubsystemBlockDto.cs @@ -11,7 +11,7 @@ public class SubsystemBlockDto : ItemInfoDto /// /// Длина ствола скважины /// - public double? WellBore { get; set; } + public double? Wellbore { get; set; } /// /// Кол-во замеров за сутки diff --git a/AsbCloudDb/Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs b/AsbCloudDb/Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs index f8d61168..67223138 100644 --- a/AsbCloudDb/Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs +++ b/AsbCloudDb/Model/DailyReports/Blocks/Subsystem/SubsystemBlock.cs @@ -4,7 +4,7 @@ namespace AsbCloudDb.Model.DailyReports.Blocks.Subsystem; public class SubsystemBlock : ItemInfo { - public double? WellBore { get; set; } + public double? Wellbore { get; set; } public double? MeasurementsPerDay { get; set; } diff --git a/AsbCloudInfrastructure/Repository/DailyReportRepository.cs b/AsbCloudInfrastructure/Repository/DailyReportRepository.cs index efd2f79e..fff15138 100644 --- a/AsbCloudInfrastructure/Repository/DailyReportRepository.cs +++ b/AsbCloudInfrastructure/Repository/DailyReportRepository.cs @@ -48,6 +48,10 @@ public class DailyReportRepository : CrudRepositoryBase d.Date); + } var entities = await query .Skip(skip) diff --git a/AsbCloudInfrastructure/Services/DailyReport/DailyReportExportService.cs b/AsbCloudInfrastructure/Services/DailyReport/DailyReportExportService.cs index 63c4c414..7c1cb1bb 100644 --- a/AsbCloudInfrastructure/Services/DailyReport/DailyReportExportService.cs +++ b/AsbCloudInfrastructure/Services/DailyReport/DailyReportExportService.cs @@ -76,7 +76,7 @@ public class DailyReportExportService : IDailyReportExportService private const string cellSubsystemComment = "D35"; private const string cellSubsystemTvgLagDays = "F80"; private const string cellSubsystemMeasurementsPerDay = "F81"; - private const string cellSubsystemWellBore = "C9"; + private const string cellSubsystemWellbore = "C9"; private const string cellSubsystemTotalRopPlan = "E70"; private const string cellSignDrillingMaster = "C85"; @@ -199,7 +199,7 @@ public class DailyReportExportService : IDailyReportExportService sheet.Cell(cellSubsystemComment).Value = subsystemBlock.Comment; sheet.Cell(cellSubsystemTvgLagDays).Value = subsystemBlock.TvgLagDays; sheet.Cell(cellSubsystemMeasurementsPerDay).Value = subsystemBlock.MeasurementsPerDay; - sheet.Cell(cellSubsystemWellBore).Value = subsystemBlock.WellBore; + sheet.Cell(cellSubsystemWellbore).Value = subsystemBlock.Wellbore; sheet.Cell(cellSubsystemTotalRopPlan).Value = subsystemBlock.TotalRopPlan; } diff --git a/AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs b/AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs index 54dd47db..5a8eeaef 100644 --- a/AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs +++ b/AsbCloudWebApi.Tests/Services/DailyReportServiceTest.cs @@ -34,7 +34,7 @@ public class DailyReportServiceTest private readonly SubsystemBlockDto fakeSubsystemBlock = new() { IdUser = idUser, - WellBore = 999, + Wellbore = 999, MeasurementsPerDay = 999, TotalRopPlan = 999, Comment = "Увеличить обороты",