diff --git a/ITServiceManager/ITServiceManager/Entities/Service.cs b/ITServiceManager/ITServiceManager/Entities/Service.cs index bab84a6..d69cd25 100644 --- a/ITServiceManager/ITServiceManager/Entities/Service.cs +++ b/ITServiceManager/ITServiceManager/Entities/Service.cs @@ -10,8 +10,10 @@ public class Service [DisplayName("Тип услуги")] public ServiceType ServiceType { get; private set; } - [DisplayName("Описание")] + [DisplayName("Название услуги")] public string ServiceName { get; private set; } = string.Empty; + + [DisplayName("Описание")] public string Description { get; private set; } = string.Empty; public static Service CreateEntity(int id, ServiceType type, string name, string description) diff --git a/ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs b/ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs index ab99d84..b322bc9 100644 --- a/ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs +++ b/ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs @@ -36,7 +36,7 @@ public class OrderRepository : IOrderRepository } using var connection = new NpgsqlConnection(_connectionString.ConnectionString); 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 LEFT JOIN Companies c on c.Id = o.CompanyId INNER JOIN Order_Service AS os ON o.id = os.orderId