Tonby73/PIBD_21_Basalov_A_D_ProjectTourAgency
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Я хочу плакать. Это маленькая строка кода, но это огронмый шаг. Завтра доделаю ограничения на вывод в таблицу. Пока что выводиться все

Browse Source
This commit is contained in:
Tonb73 2024-12-05 20:50:17 +03:00
parent 28d32ae5ba
commit 0d6d6dec90
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/ProjectTourAgency/Implementations/TourRepository.cs
View File

@ -83,7 +83,7 @@ WHERE Id = @id";
{ {
using var connection = new NpgsqlConnection(_connectionString.ConnectionString); using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @" 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"; INNER JOIN ClientTour ct ON ct.TourId = t.Id";
var tour = connection.Query<TempClientTour>(querySelect); var tour = connection.Query<TempClientTour>(querySelect);
_logger.LogDebug("Получение объектов {json}", JsonConvert.SerializeObject(tour)); _logger.LogDebug("Получение объектов {json}", JsonConvert.SerializeObject(tour));

2
project/ProjectTourAgency/Reports/TableReportcs.cs
View File

@ -52,7 +52,7 @@ internal class TableReport
endDate) endDate)
{ {
var data = _tourRepository.ReadTours().Select(x => new { 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, Date = x.DepartureDate,
CountIn = (int?)null, CountIn = (int?)null,
CountOut = (int?)x.ClientTours.Sum(x => x.Cost) CountOut = (int?)x.ClientTours.Sum(x => x.Cost)