vasmaae/PIbd-23_Gutorov_I.A._IT-Company
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix excel report with sum

Browse Source
This commit is contained in:
vasmaae 2024-12-24 14:16:39 -08:00
parent bce2e9612a
commit 2edfb98b6a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PIbd-23_Gutorov_I.A._IT-Company/Reports/TableReport.cs
View File

@ -43,7 +43,7 @@ internal class TableReport
{ {
var data = _contractRepository var data = _contractRepository
.ReadContracts(customerId: customerId, dateFrom: startDate, dateTo: endDate) .ReadContracts(customerId: customerId, dateFrom: startDate, dateTo: endDate)
.GroupBy(x => x.ConclusionDate) .GroupBy(x => x.ExecutorFullName)
.Select(x => new .Select(x => new
{ {
x.First().ExecutorFullName, x.First().ExecutorFullName,
@ -54,7 +54,7 @@ internal class TableReport
.Union( .Union(
_contractRepository _contractRepository
.ReadContracts(customerId: customerId, dateFrom: startDate, dateTo: endDate) .ReadContracts(customerId: customerId, dateFrom: startDate, dateTo: endDate)
.GroupBy(x => x.Deadline) .GroupBy(x => x.ExecutorFullName)
.Select(x => new .Select(x => new
{ {
x.First().ExecutorFullName, x.First().ExecutorFullName,
@ -69,12 +69,12 @@ internal class TableReport
return new List<string[]>() { item } return new List<string[]>() { item }
.Union(data.Select(x => new string[] { .Union(data.Select(x => new string[] {
x.ExecutorFullName, x.ExecutorFullName,
x.Date.ToString(), x.Date.ToString("dd.MM.yyyy"),
x.CountIn?.ToString() ?? string.Empty, x.CountIn?.ToString("N0") ?? string.Empty,
x.CountOut?.ToString() ?? string.Empty x.CountOut?.ToString("N0") ?? string.Empty
})) }))
.Union( .Union(
[["Всего", "", data.Sum(x => x.CountIn ?? 0).ToString(), data.Sum(x => x.CountOut ?? 0).ToString()]]) [["Всего", "", data.Sum(x => x.CountIn ?? 0).ToString("N0"), data.Sum(x => x.CountOut ?? 0).ToString("N0")]])
.ToList(); .ToList();
} }
} }