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
2021-11-17 15:20:33 +07:00
parent afc4429e63
commit b6e27e9f12
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApiControllers/rep_eva_xControllers.cs
View File

@@ -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;

18
Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs
View File

@@ -214,6 +214,24 @@ namespace TodoAPI2.Models
public DateTime? supervisor3A_date { get; set; }
[MaxLength(1)]
public string status_supervisor3A { get; set; }
public decimal? total_summary_supervisor3A { get; set; }
public decimal? Final_summary_supervisor3A { get; set; }
public decimal? total_summary_competency_supervisor3A { get; set; }
public decimal? Final_summary_competency_supervisor3A { get; set; }
public decimal? achievement_supervisor3A { get; set; }
public decimal? competency_supervisor3A { get; set; }
public decimal? score_supervisor3A { get; set; }
[MaxLength(255)]
public string level_score_supervisor3A { get; set; }
}
}

4
Models/rep_eva_x/rep_eva_xInputModel2.cs
View File

@@ -31,6 +31,8 @@ namespace TodoAPI2.Models
public string supervisor1A_position { get; set; }
public string supervisor2A_fullname { get; set; }
public string supervisor2A_position { get; set; }
public string supervisor3A_fullname { get; set; }
public string supervisor3A_position { get; set; }
public string leave_period { get; set; }
public string main_dept { get; set; }
public int? selected_round { get; set; }
@@ -66,6 +68,8 @@ namespace TodoAPI2.Models
public string eva_detail_remark { get; set; }
public string print_dt { get; set; }
}
}