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

ส่ง code แก้ไข OP Change Request 18 ข้อ

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-05-24 00:33:22 +07:00
parent 017a29c136
commit eea05beb69
81 changed files with 1047 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/eva_create_evaluation/eva_create_evaluationService.cs
View File

@@ -144,7 +144,7 @@ namespace TodoAPI2.Models
supervisor1_id = m_eva_create_evaluation.supervisor1_id,
supervisor2_id = m_eva_create_evaluation.supervisor2_id,
performance_plan_id_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.fiscal_year,
performance_plan_id_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.display_text,
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,

6
Models/eva_create_evaluation/eva_create_evaluationViewModel.cs
View File

@@ -28,7 +28,7 @@ namespace TodoAPI2.Models
public int? supervisor2_id { get; set; }
public int? performance_plan_id_eva_performance_plan_fiscal_year { get; set; }
public string 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; }
@@ -42,9 +42,7 @@ namespace TodoAPI2.Models
{
string y = "";
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_name + " ปี " +y;
return evaluation_group_id_eva_evaluation_group_name + " " + performance_plan_id_eva_performance_plan_fiscal_year;
}
}
}