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-06 09:48:18 +03:00
parent 29371c7f97
commit 914aa3c596
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ namespace ProjectTourAgency.Reports
new ExcelBuilder(filePath) new ExcelBuilder(filePath)
.AddHeader("Сводка по движению корма", 0, 4) .AddHeader("Сводка по движению корма", 0, 4)
.AddParagraph("за период", 0) .AddParagraph("за период", 0)
.AddTable(new[] { 10, 10, 15, 15 }, GetData(tourId, startDate, endDate)) // Исправлено на правильный синтаксис .AddTable(new[] { 10, 10, 15, 15 }, GetData(tourId, startDate, endDate))
.Build(); .Build();
return true; return true;
} }
@ -45,7 +45,7 @@ namespace ProjectTourAgency.Reports
private List<string[]> GetData(int tourId, DateTime startDate, DateTime endDate) private List<string[]> GetData(int tourId, DateTime startDate, DateTime endDate)
{ {
// Получаем данные о турах
var tourData = _tourRepository.ReadTours() var tourData = _tourRepository.ReadTours()
.Where(x => x.DepartureDate >= startDate && x.DepartureDate <= endDate && x.ClientTours.Any(y => y.TourId == tourId)) .Where(x => x.DepartureDate >= startDate && x.DepartureDate <= endDate && x.ClientTours.Any(y => y.TourId == tourId))
.SelectMany(x => x.ClientTours .SelectMany(x => x.ClientTours
@ -57,10 +57,10 @@ namespace ProjectTourAgency.Reports
CountOut = (int?)y.Cost CountOut = (int?)y.Cost
})); }));
// Получаем уникальные ClientId из tourData
var clientIds = tourData.Select(x => x.ClientId).Distinct().ToList(); var clientIds = tourData.Select(x => x.ClientId).Distinct().ToList();
// Получаем данные о пополнениях, фильтруя по ClientId
var addMoneyData = _addMoneyRepository.ReadAddMoneys() var addMoneyData = _addMoneyRepository.ReadAddMoneys()
.Where(x => x.Date >= startDate && x.Date <= endDate && clientIds.Contains(x.ClientId)) .Where(x => x.Date >= startDate && x.Date <= endDate && clientIds.Contains(x.ClientId))
.Select(x => new { .Select(x => new {
@ -70,7 +70,7 @@ namespace ProjectTourAgency.Reports
CountOut = (int?)null CountOut = (int?)null
}); });
// Объединяем данные
var data = tourData var data = tourData
.Union(addMoneyData) .Union(addMoneyData)
.OrderBy(x => x.Date); .OrderBy(x => x.Date);