diff --git a/Models/eva_create_evaluation/eva_create_evaluationService.cs b/Models/eva_create_evaluation/eva_create_evaluationService.cs index 5231b9d..79a7c02 100644 --- a/Models/eva_create_evaluation/eva_create_evaluationService.cs +++ b/Models/eva_create_evaluation/eva_create_evaluationService.cs @@ -71,7 +71,7 @@ namespace TodoAPI2.Models var entity = _repository.Get(id); var i = Mapper.Map(entity); - i.item_performance_plan_id = (from x in _repository.Context.eva_performance_plan select x).ToList(); + i.item_performance_plan_id = (from x in _repository.Context.eva_performance_plan orderby x.fiscal_year descending, x.theTime descending select x).ToList(); i.item_employee_id = all_emp; i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList(); i.item_supervisor1_id = all_emp; @@ -85,7 +85,7 @@ namespace TodoAPI2.Models var all_emp = emp.GetAllEmployee(); var i = new eva_create_evaluationWithSelectionViewModel(); - i.item_performance_plan_id = (from x in _repository.Context.eva_performance_plan select x).ToList(); + i.item_performance_plan_id = (from x in _repository.Context.eva_performance_plan orderby x.fiscal_year descending, x.theTime descending select x).ToList(); i.item_employee_id = all_emp; i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList(); i.item_supervisor1_id = all_emp; @@ -138,7 +138,7 @@ namespace TodoAPI2.Models && (m_eva_create_evaluation.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue) - orderby fk_eva_performance_planResult1.fiscal_year, fk_eva_performance_planResult1.theTime, fk_eva_evaluation_groupResult5.code + orderby fk_eva_performance_planResult1.fiscal_year descending, fk_eva_performance_planResult1.theTime descending, fk_eva_evaluation_groupResult5.code ascending select new eva_create_evaluationViewModel() { id = m_eva_create_evaluation.id,