ปรับปรุงรายงาน
This commit is contained in:
@@ -375,6 +375,8 @@ namespace TodoAPI2.Controllers
|
||||
i.supervisor1A_position = p.supervisor1A_position + checkLevel(p.supervisor1A_position_type_id, p.supervisor1A_position_level_text, p.supervisor1A_fullname);
|
||||
i.supervisor2A_fullname = p.supervisor2A_fullname;
|
||||
i.supervisor2A_position = p.supervisor2A_position + checkLevel(p.supervisor2A_position_type_id, p.supervisor2A_position_level_text, p.supervisor2A_fullname);
|
||||
i.supervisor3A_fullname = p.supervisor3A_fullname;
|
||||
i.supervisor3A_position = p.supervisor3A_position + checkLevel(p.supervisor3A_position_type_id, p.supervisor3A_position_level_text, p.supervisor3A_fullname);
|
||||
i.main_dept = p.employee_main_dept;
|
||||
|
||||
if (i.main_dept != null) i.main_dept = i.main_dept.Replace("กอง","");
|
||||
@@ -455,7 +457,18 @@ namespace TodoAPI2.Controllers
|
||||
|
||||
private void checkValue(eva_create_evaluation_detailEntity detail, ref rep_eva_xInputModel2 i)
|
||||
{
|
||||
if (detail.status_supervisor2A == "Y")
|
||||
if (detail.status_supervisor3A == "Y")
|
||||
{
|
||||
i.total_summary_supervisor2a = detail.total_summary_supervisor3A;
|
||||
i.final_summary_supervisor2a = detail.Final_summary_supervisor3A;
|
||||
i.total_summary_competency_supervisor2a = detail.total_summary_competency_supervisor3A;
|
||||
i.final_summary_competency_supervisor2a = detail.Final_summary_competency_supervisor3A;
|
||||
i.achievement_supervisor2a = detail.achievement_supervisor3A;
|
||||
i.competency_supervisor2a = detail.competency_supervisor3A;
|
||||
i.score_supervisor2a = detail.score_supervisor3A;
|
||||
i.level_score_supervisor2a = detail.level_score_supervisor3A;
|
||||
}
|
||||
else if (detail.status_supervisor2A == "Y")
|
||||
{
|
||||
i.total_summary_supervisor2a = detail.total_summary_supervisor2A;
|
||||
i.final_summary_supervisor2a = detail.Final_summary_supervisor2A;
|
||||
|
||||
Reference in New Issue
Block a user