admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chnage loan list to new type

Browse Source
This commit is contained in:
mahan
2026-02-03 13:44:47 +03:30
parent 0e7787dd56
commit fa4c39904a
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CompanyManagment.App.Contracts/Loan/ILoanApplication.cs
View File

@@ -21,6 +21,6 @@ public class LoanGroupedViewModel
{ {
public List<LoanGroupedByDateViewModel> GroupedByDate { get; set; } public List<LoanGroupedByDateViewModel> GroupedByDate { get; set; }
public List<LoanGroupedByEmployeeViewModel>GroupedByEmployee { get; set; } public List<LoanGroupedByEmployeeViewModel>GroupedByEmployee { get; set; }
public List<LoanViewModel> LoanListViewModel { get; set; } public PagedResult<LoanViewModel> LoanListViewModel { get; set; }
} }

37
CompanyManagment.EFCore/Repository/LoanRepository.cs
View File

@@ -171,22 +171,29 @@ public class LoanRepository : RepositoryBase<long, Loan>, ILoanRepository
query = query.Where(x => x.StartInstallmentPayment >= startDate && x.StartInstallmentPayment <= endDate); query = query.Where(x => x.StartInstallmentPayment >= startDate && x.StartInstallmentPayment <= endDate);
} }
result.LoanListViewModel = query.OrderByDescending(x => x.StartInstallmentPayment).ApplyPagination(searchModel.PageIndex,searchModel.PageSize) result.LoanListViewModel = new PagedResult<LoanViewModel>()
.Take(30).ToList() {
.Select(x => new LoanViewModel() TotalCount = query.Count(),
{ List = query.OrderByDescending(x => x.StartInstallmentPayment)
EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName, .ApplyPagination(searchModel.PageIndex, searchModel.PageSize)
PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode.ToString(), .Take(30).ToList()
Amount = x.Amount.ToMoney(), .Select(x => new LoanViewModel()
AmountPerMonth = x.AmountPerMonth.ToMoney(), {
StartDateTime = x.StartInstallmentPayment.ToFarsi(), EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName,
Count = x.Count, PersonnelCode = personnelCodes.FirstOrDefault(p => p.EmployeeId == x.EmployeeId).PersonnelCode
Id = x.id, .ToString(),
WorkshopId = x.WorkshopId, Amount = x.Amount.ToMoney(),
EmployeeId = x.EmployeeId, AmountPerMonth = x.AmountPerMonth.ToMoney(),
YearFa = pc.GetYear(x.StartInstallmentPayment).ToString(), 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; return result;
} }