Anitonchik/PIbd-24_Antonova_A.A._CompanyFurniture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

пара папапа

Browse Source
This commit is contained in:
Anitonchik 2024-12-13 13:29:39 +04:00
parent 3c299e471e
commit f776caeb61
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ProjectCompanyFurniture/ProjectCompanyFurniture/Reports/ChartReport.cs
View File

@ -40,8 +40,8 @@ public class ChartReport
return _invoiceRepository return _invoiceRepository
.ReadInvoices(dateForm: dateTime.Date, dateTo: dateTime.Date.AddDays(1)) .ReadInvoices(dateForm: dateTime.Date, dateTo: dateTime.Date.AddDays(1))
.Where(x => x.DateInvoice.Date == dateTime.Date) .Where(x => x.DateInvoice.Date == dateTime.Date)
.GroupBy(x => x.ClientID, (key, group) => new { ID = key, Count = group.Sum(y => y.SellingPrice)}) .GroupBy(x => x.ClientName, (key, group) => new { ClientName = key, Count = group.Sum(y => y.SellingPrice)})
.Select(x => (x.ID.ToString(), (double)x.Count)) .Select(x => (x.ClientName, (double)x.Count))
.ToList(); .ToList();
} }
} }

2
ProjectCompanyFurniture/ProjectCompanyFurniture/Repositories/Implementations/InvoiceRepository.cs
View File

@ -98,7 +98,7 @@ public class InvoiceRepository : IInvoiceRepository
using var connection = new NpgsqlConnection(_connectionString.ConnectionString); using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @$"SELECT inv.*, cl.Name as ClientName, ipr.ProductID, ipr.Count, pr.Name as ProductName var querySelect = @$"SELECT inv.*, cl.Name as ClientName, ipr.ProductID, ipr.Count, pr.Name as ProductName
FROM Invoices inv FROM Invoices inv
INNER JOIN InvoiceProducts ipr ON ipr.InvoiceID = inv.ID AND ipr.ProductID = @productID INNER JOIN InvoiceProducts ipr ON ipr.InvoiceID = inv.ID{((productID is null) ? "" : " AND ipr.ProductID = @productID")}
INNER JOIN Clients cl ON inv.ClientID = cl.ID INNER JOIN Clients cl ON inv.ClientID = cl.ID
INNER JOIN Products pr ON pr.ID = ipr.ProductID INNER JOIN Products pr ON pr.ID = ipr.ProductID
{builder.Build()}"; {builder.Build()}";