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

แก้ไขหลายอย่าง

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-03-12 13:03:09 +07:00
parent 740b2d54b8
commit 7171806d1c
90 changed files with 14414 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Models/eva_create_evaluation/eva_create_evaluationService.cs
View File

@@ -144,6 +144,7 @@ namespace TodoAPI2.Models
performance_plan_id_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.fiscal_year,
employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
evaluation_group_id_eva_evaluation_group_code = fk_eva_evaluation_groupResult5.code,
evaluation_group_id_eva_evaluation_group_name = fk_eva_evaluation_groupResult5.thegroup,
supervisor1_id_external_linkage_external_name = fk_external_linkageResult6.fullname,
supervisor2_id_external_linkage_external_name = fk_external_linkageResult7.fullname,

4
Models/eva_create_evaluation/eva_create_evaluationViewModel.cs
View File

@@ -31,6 +31,8 @@ namespace TodoAPI2.Models
public int? performance_plan_id_eva_performance_plan_fiscal_year { get; set; }
public string employee_id_external_linkage_external_name { get; set; }
public string evaluation_group_id_eva_evaluation_group_code { get; set; }
public string evaluation_group_id_eva_evaluation_group_name { get; set; }
public string supervisor1_id_external_linkage_external_name { get; set; }
public string supervisor2_id_external_linkage_external_name { get; set; }
@@ -42,7 +44,7 @@ namespace TodoAPI2.Models
if (performance_plan_id_eva_performance_plan_fiscal_year.HasValue) y = performance_plan_id_eva_performance_plan_fiscal_year.ToString();
return evaluation_group_id_eva_evaluation_group_code + " ปี " +y;
return evaluation_group_id_eva_evaluation_group_name + " ปี " +y;
}
}
}