diff --git a/CompanyManagment.App.Contracts/DateSalary/DateSalaryViewModel.cs b/CompanyManagment.App.Contracts/DateSalary/DateSalaryViewModel.cs index 5bdb23a0..51633ba4 100644 --- a/CompanyManagment.App.Contracts/DateSalary/DateSalaryViewModel.cs +++ b/CompanyManagment.App.Contracts/DateSalary/DateSalaryViewModel.cs @@ -1,4 +1,6 @@ -namespace CompanyManagment.App.Contracts.DateSalary; +using System; + +namespace CompanyManagment.App.Contracts.DateSalary; public class DateSalaryViewModel { @@ -7,4 +9,6 @@ public class DateSalaryViewModel public string Month { get; set; } public string StartDateFa { get; set; } public string EndDateFa { get; set; } + public DateTime StartDateGr { get; set; } + public DateTime EndDateGr { get; set; } } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/DateSalaryRepository.cs b/CompanyManagment.EFCore/Repository/DateSalaryRepository.cs index 82b5d2a4..e0ff2fa6 100644 --- a/CompanyManagment.EFCore/Repository/DateSalaryRepository.cs +++ b/CompanyManagment.EFCore/Repository/DateSalaryRepository.cs @@ -43,6 +43,9 @@ public class DateSalaryRepository : RepositoryBase, IDateSalar Year = x.Year, StartDateFa = x.StartDateFa, EndDateFa = x.EndDateFa, + StartDateGr = x.StartDateGr, + EndDateGr = x.EndDateGr + }); var list = query.OrderByDescending(x => x.Id).ToList(); @@ -51,7 +54,7 @@ public class DateSalaryRepository : RepositoryBase, IDateSalar if (!string.IsNullOrWhiteSpace(searchModel.Month)) list = list.Where(x => x.Year == searchModel.Month).OrderByDescending(x => x.Year).ToList(); - return list; + return list.OrderByDescending(x=>x.StartDateGr).ToList(); } public DateSalaryViewModel GetDateSalaryViewModel(DateSalarySearchModel searchModel) { diff --git a/CompanyManagment.EFCore/Repository/InsuranceJobRepository.cs b/CompanyManagment.EFCore/Repository/InsuranceJobRepository.cs index aa79212e..d9834a1f 100644 --- a/CompanyManagment.EFCore/Repository/InsuranceJobRepository.cs +++ b/CompanyManagment.EFCore/Repository/InsuranceJobRepository.cs @@ -195,7 +195,7 @@ public class InsuranceJobRepository : RepositoryBase, IInsur EndDate = x.EndDate, - }); + }).OrderByDescending(x=>x.StartDate); return res.Select(x => (x.Id, $"{(x.StartDate.HasValue ? x.StartDate.Value.ToFarsi() : "نامشخص")} - {(x.EndDate.HasValue ? x.EndDate.Value.ToFarsi() : "نامشخص")}")).ToList();