pyzhov.egor/PIbd-22_Pyzhov_E.A._ITServiceManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Подкоректировал запрос

Browse Source
This commit is contained in:
Егор Пыжов 2024-12-15 02:49:07 +04:00
parent 34a074f709
commit 7a1b7fb72a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ITServiceManager/ITServiceManager/Entities/Service.cs
View File

@ -10,8 +10,10 @@ public class Service
[DisplayName("Тип услуги")] [DisplayName("Тип услуги")]
public ServiceType ServiceType { get; private set; } public ServiceType ServiceType { get; private set; }
[DisplayName("Описание")] [DisplayName("Название услуги")]
public string ServiceName { get; private set; } = string.Empty; public string ServiceName { get; private set; } = string.Empty;
[DisplayName("Описание")]
public string Description { get; private set; } = string.Empty; public string Description { get; private set; } = string.Empty;
public static Service CreateEntity(int id, ServiceType type, string name, string description) public static Service CreateEntity(int id, ServiceType type, string name, string description)

2
ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs
View File

@ -36,7 +36,7 @@ public class OrderRepository : IOrderRepository
} }
using var connection = new NpgsqlConnection(_connectionString.ConnectionString); using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
var querySelect = @$" var querySelect = @$"
SELECT o.*, c.Name as CompanyName, os.serviceId, os.quantity, s.ServiceType as ServiceName SELECT o.*, c.Name as CompanyName, os.serviceId, os.quantity, s.ServiceName as ServiceName
FROM Orders AS o FROM Orders AS o
LEFT JOIN Companies c on c.Id = o.CompanyId LEFT JOIN Companies c on c.Id = o.CompanyId
INNER JOIN Order_Service AS os ON o.id = os.orderId INNER JOIN Order_Service AS os ON o.id = os.orderId