diff --git a/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs b/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs index a28f3a3f..105d681e 100644 --- a/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs +++ b/CompanyManagment.EFCore/Repository/CustomizeCheckoutRepository.cs @@ -224,7 +224,7 @@ namespace CompanyManagment.EFCore.Repository SalaryAidDateTimeGe = s.SalaryAidDateTime }).ToList(), - LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{x.LateToWorkValue.Minutes:D2}", + LateToWorkValue = x.LateToWorkValue == TimeSpan.Zero ? "-" : $"{(int)x.LateToWorkValue.TotalHours}:{Convert.ToInt32(x.LateToWorkValue.TotalMinutes % 60):00}", SettingSalary = x.SettingSalary.ToMoney(), DailyWage = x.DailyWage.ToMoney(), ShiftStatus = x.ShiftStatus, @@ -281,6 +281,9 @@ namespace CompanyManagment.EFCore.Repository foreach (var checkout in customizeCheckoutsList) { + checkout.EmployeePicture = + employeePictures.FirstOrDefault(p => p.Id == checkout.EmployeeId).Picture ?? ""; + checkout.PrintCounter = counter++; //var leftwork = leftWorksList.FirstOrDefault(x => checkout.WorkshopId == x.WorkshopId && x.EmployeeId == checkout.EmployeeId);