change list key for salary aid
This commit is contained in:
@@ -8,7 +8,7 @@ public class SalaryAidsGroupedViewModel
|
||||
{
|
||||
public List<SalaryAidGroupedByEmployeeViewModel> GroupedByEmployee { get; set; }
|
||||
public List<SalaryAidGroupedByDateViewModel> GroupedByDate { get; set; }
|
||||
public PagedResult<SalaryAidViewModel> SalaryAidListViewModels { get; set; }
|
||||
public PagedResult<SalaryAidViewModel> List { get; set; }
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -197,7 +197,7 @@ public class SalaryAidRepository : RepositoryBase<long, SalaryAid>, ISalaryAidRe
|
||||
query = query.Where(x => x.SalaryAidDateTime >= startDate && x.SalaryAidDateTime <= endDate);
|
||||
}
|
||||
|
||||
result.SalaryAidListViewModels = new PagedResult<SalaryAidViewModel>()
|
||||
result.List = new PagedResult<SalaryAidViewModel>()
|
||||
{
|
||||
TotalCount = query.Count(),
|
||||
List = query.OrderByDescending(x => x.SalaryAidDateTime).ApplyPagination(searchModel.PageIndex,searchModel.PageSize).ToList()
|
||||
|
||||
Reference in New Issue
Block a user