thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ปรับปรุง ปรับเลื่อน ค่าตอบแทน

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-07-08 14:29:02 +07:00
parent 93f58f0be3
commit 3a00d8c0f4
5 changed files with 90 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalService.cs
View File

@@ -87,6 +87,26 @@ namespace TodoAPI2.Models
i.item_managed_by = all_emp.ToList();
i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
var data_fiscal_year = (from f_y in _repository.Context.eva_adjust_postponement
group f_y by f_y.fiscal_year into new_group
orderby new_group.Key descending
select new
{
fiscal_year = new_group.Key
}
).ToList();
var result = new List<external_linkageViewModel>();
foreach (var x in data_fiscal_year)
{
result.Add(new external_linkageViewModel
{
external_id = x.fiscal_year,
external_code = x.fiscal_year.ToString(),
external_name = x.fiscal_year.ToString()
});
}
i.item_fiscal_year = result;
return i;
}
@@ -104,6 +124,15 @@ namespace TodoAPI2.Models
fiscal_year = new_group.Key
}
).ToList();
var result = new List<external_linkageViewModel>();
foreach(var x in data_fiscal_year)
{
result.Add(new external_linkageViewModel {
external_id = x.fiscal_year,
external_code = x.fiscal_year.ToString(),
external_name = x.fiscal_year.ToString()
});
}
var i = new eva_adjust_postponement_normalWithSelectionViewModel();
var temp = create.GetListBySearch(new eva_create_evaluationSearchModel());
@@ -112,6 +141,7 @@ namespace TodoAPI2.Models
i.item_managed_by = all_emp.ToList();
i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
i.item_fiscal_year = result;
return i;
}

1
Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalWithSelectionViewModel.cs
View File

@@ -7,6 +7,7 @@ namespace TodoAPI2.Models
{
public class eva_adjust_postponement_normalWithSelectionViewModel: eva_adjust_postponement_normalViewModel
{
public List<external_linkageViewModel> item_fiscal_year { get; set; }
public List<eva_create_evaluationViewModel> item_create_evaluation_id { get; set; }
public List<external_employeeViewModel> item_managed_by { get; set; }
public List<external_linkageViewModel> item_org_id { get; set; }