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

ПИбд-23. Гуторов И.А. Лабораторная работа 4 #4

Closed
vasmaae wants to merge 7 commits from LabWork_4 into LabWork_3
pull from: LabWork_4
merge into: vasmaae:LabWork_3
Conversation 1 Commits 7 Files Changed 20 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2edfb98b6a - Show all commits

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

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