diff --git a/CompanyManagment.App.Contracts/Loan/ILoanApplication.cs b/CompanyManagment.App.Contracts/Loan/ILoanApplication.cs index f55f3132..0e29fb6a 100644 --- a/CompanyManagment.App.Contracts/Loan/ILoanApplication.cs +++ b/CompanyManagment.App.Contracts/Loan/ILoanApplication.cs @@ -21,6 +21,6 @@ public class LoanGroupedViewModel { public List GroupedByDate { get; set; } public ListGroupedByEmployee { get; set; } - public List LoanListViewModel { get; set; } + public PagedResult LoanListViewModel { get; set; } } diff --git a/CompanyManagment.EFCore/Repository/LoanRepository.cs b/CompanyManagment.EFCore/Repository/LoanRepository.cs index fdcd58d0..bdfcec42 100644 --- a/CompanyManagment.EFCore/Repository/LoanRepository.cs +++ b/CompanyManagment.EFCore/Repository/LoanRepository.cs @@ -171,22 +171,29 @@ public class LoanRepository : RepositoryBase, ILoanRepository query = query.Where(x => x.StartInstallmentPayment >= startDate && x.StartInstallmentPayment <= endDate); } - result.LoanListViewModel = query.OrderByDescending(x => x.StartInstallmentPayment).ApplyPagination(searchModel.PageIndex,searchModel.PageSize) - .Take(30).ToList() - .Select(x => new LoanViewModel() - { - EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName, - PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode.ToString(), - Amount = x.Amount.ToMoney(), - AmountPerMonth = x.AmountPerMonth.ToMoney(), - StartDateTime = x.StartInstallmentPayment.ToFarsi(), - Count = x.Count, - Id = x.id, - WorkshopId = x.WorkshopId, - EmployeeId = x.EmployeeId, - YearFa = pc.GetYear(x.StartInstallmentPayment).ToString(), + result.LoanListViewModel = new PagedResult() + { + TotalCount = query.Count(), + List = query.OrderByDescending(x => x.StartInstallmentPayment) + .ApplyPagination(searchModel.PageIndex, searchModel.PageSize) + .Take(30).ToList() + .Select(x => new LoanViewModel() + { + EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName, + PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode + .ToString(), + Amount = x.Amount.ToMoney(), + AmountPerMonth = x.AmountPerMonth.ToMoney(), + StartDateTime = x.StartInstallmentPayment.ToFarsi(), + Count = x.Count, + Id = x.id, + WorkshopId = x.WorkshopId, + EmployeeId = x.EmployeeId, + YearFa = pc.GetYear(x.StartInstallmentPayment).ToString(), + + }).ToList() + }; - }).ToList(); return result; }