From 0d6d6dec900105c6191feceea65512edf1600de2 Mon Sep 17 00:00:00 2001 From: Tonb73 Date: Thu, 5 Dec 2024 20:50:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=AF=20=D1=85=D0=BE=D1=87=D1=83=20=D0=BF?= =?UTF-8?q?=D0=BB=D0=B0=D0=BA=D0=B0=D1=82=D1=8C.=20=D0=AD=D1=82=D0=BE=20?= =?UTF-8?q?=D0=BC=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C=D0=BA=D0=B0=D1=8F=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BA=D0=B0=20=D0=BA=D0=BE=D0=B4=D0=B0,=20?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=8D=D1=82=D0=BE=20=D0=BE=D0=B3=D1=80=D0=BE?= =?UTF-8?q?=D0=BD=D0=BC=D1=8B=D0=B9=20=D1=88=D0=B0=D0=B3.=20=D0=97=D0=B0?= =?UTF-8?q?=D0=B2=D1=82=D1=80=D0=B0=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0?= =?UTF-8?q?=D1=8E=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D0=B0=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=83.=20=D0=9F?= =?UTF-8?q?=D0=BE=D0=BA=D0=B0=20=D1=87=D1=82=D0=BE=20=D0=B2=D1=8B=D0=B2?= =?UTF-8?q?=D0=BE=D0=B4=D0=B8=D1=82=D1=8C=D1=81=D1=8F=20=D0=B2=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project/ProjectTourAgency/Implementations/TourRepository.cs | 2 +- project/ProjectTourAgency/Reports/TableReportcs.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/ProjectTourAgency/Implementations/TourRepository.cs b/project/ProjectTourAgency/Implementations/TourRepository.cs index f0eaf9f..f78bf25 100644 --- a/project/ProjectTourAgency/Implementations/TourRepository.cs +++ b/project/ProjectTourAgency/Implementations/TourRepository.cs @@ -83,7 +83,7 @@ WHERE Id = @id"; { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); var querySelect = @" -SELECT t.*, ct.TourId, ct.Cost FROM Tour t +SELECT t.*, ct.TourId, ct.Cost, ct.ClientId FROM Tour t INNER JOIN ClientTour ct ON ct.TourId = t.Id"; var tour = connection.Query(querySelect); _logger.LogDebug("Получение объектов {json}", JsonConvert.SerializeObject(tour)); diff --git a/project/ProjectTourAgency/Reports/TableReportcs.cs b/project/ProjectTourAgency/Reports/TableReportcs.cs index 8bff658..44589a0 100644 --- a/project/ProjectTourAgency/Reports/TableReportcs.cs +++ b/project/ProjectTourAgency/Reports/TableReportcs.cs @@ -52,7 +52,7 @@ internal class TableReport endDate) { var data = _tourRepository.ReadTours().Select(x => new { - ClientId = (int ?)x.ClientTours.Sum(x => x.ClientId), + ClientId = (int ?)x.ClientTours.FirstOrDefault(y => y.TourId > 0).ClientId, Date = x.DepartureDate, CountIn = (int?)null, CountOut = (int?)x.ClientTours.Sum(x => x.Cost)