From 02bb47bdb366f84be458c5fa83f1ce4c00d37465 Mon Sep 17 00:00:00 2001 From: sheymuh Date: Sat, 21 Dec 2024 22:42:34 +0400 Subject: [PATCH] =?UTF-8?q?4=20=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=B3=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectPassengerTransportation/Reports/TableReport.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs index 0503bae..217e5db 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Reports/TableReport.cs @@ -46,7 +46,7 @@ public class TableReport .ReadShifts(dateFrom: startDate, dateTo: endDate, employeeId: employeeId, busId: busId) .Where(x => x.Date >= startDate && x.Date <= endDate && x.Starting_shift_employees.Any(y => y.Employee_id == employeeId)) .Select(x => new { - EmployeeId = (int?)employeeId, + EmployeeId = x.Starting_shift_employees.FirstOrDefault(y => y.Employee_id == employeeId)?.Employee_name, BusId = (string?)null, x.Date, WorkHours = x.Starting_shift_employees.FirstOrDefault(y => y.Employee_id == employeeId)?.Work_time, @@ -56,7 +56,7 @@ public class TableReport .ReadServices() .Where(x => x.Date >= startDate && x.Date <= endDate && x.Bus_id == busId) .Select(x => new { - EmployeeId = (int?)null, + EmployeeId = (string?)null, BusId = (string?)x.Bus_name, x.Date, WorkHours = (int?)null, @@ -67,7 +67,7 @@ public class TableReport return new List() { item } .Union(data .Select(x => new string[] { - x.EmployeeId.ToString() ?? string.Empty, + x.EmployeeId ?? string.Empty, x.BusId ?? string.Empty, x.Date.ToString("dd.MM.yyyy"), x.WorkHours?.ToString("N0") ?? string.Empty,