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

แก้ไขตาม feedback ในห้อง

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2021-02-17 16:44:40 +07:00
parent 2825bdde24
commit 96b8cbd159
10 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApiControllers/rep_eva_xControllers.cs
View File

@@ -287,7 +287,10 @@ namespace TodoAPI2.Controllers
i.employee_code = p.employee_code;
i.employee_position_type = p.employee_position_type;
i.employee_position_level = p.employee_position_level;
i.employee_org = p.employee_org;
i.employee_org = p.employee_org;
if (i.employee_org != null) i.employee_org = i.employee_org.Replace("แผนก", "");
i.employee_position = p.employee_position;
if (!string.IsNullOrEmpty(p.employee_profile_picture))
{
@@ -315,6 +318,9 @@ namespace TodoAPI2.Controllers
i.supervisor2A_fullname = p.supervisor2A_fullname;
i.supervisor2A_position = p.supervisor2A_position;
i.main_dept = p.employee_main_dept;
if (i.main_dept != null) i.main_dept = i.main_dept.Replace("กอง","");
i.leave_period = MyHelper.GetDateStringForReport(p.start_date) + " ถึง " + MyHelper.GetDateStringForReport(p.end_date);
i.selected_round = p.selected_round;
@@ -360,17 +366,25 @@ namespace TodoAPI2.Controllers
i.w1 = p.create_evaluation_score1;
i.w2 = p.create_evaluation_score2;
var q = emp.GetLeaveOfEmployee(p.employee_id.Value, p.start_date, p.end_date);
i.sum_day_sick_leave = q.sum_day_sick_leave;
i.count_sick_leave = q.count_sick_leave;
i.sum_day_personal_leave = q.sum_day_personal_leave;
i.count_personal_leave = q.count_personal_leave;
i.sum_day_vacation_leave = q.sum_day_vacation_leave;
i.count_stop_working = q.count_stop_working;
i.count_late_tad_processing_time_results = q.count_late_tad_processing_time_results;
i.count_absence_tad_processing_time_results = q.count_absence_tad_processing_time_results;
i.sum_day_sick_personal_leave = q.sum_day_sick_personal_leave;
i.count_sick_personal_leave = q.count_sick_personal_leave;
if(p.start_date.HasValue && p.end_date.HasValue)
{
var q = emp.GetLeaveOfEmployee(p.employee_id.Value, p.start_date, p.end_date);
i.sum_day_sick_leave = q.sum_day_sick_leave;
i.count_sick_leave = q.count_sick_leave;
i.sum_day_personal_leave = q.sum_day_personal_leave;
i.count_personal_leave = q.count_personal_leave;
i.sum_day_vacation_leave = q.sum_day_vacation_leave;
i.count_stop_working = q.count_stop_working;
i.count_late_tad_processing_time_results = q.count_late_tad_processing_time_results;
i.count_absence_tad_processing_time_results = q.count_absence_tad_processing_time_results;
i.sum_day_sick_personal_leave = q.sum_day_sick_personal_leave;
i.count_sick_personal_leave = q.count_sick_personal_leave;
}
i.txt_status_self_a_click_date = MyHelper.GetDateStringForReport(p.status_self_a_click_date);
if (i.txt_status_self_a_click_date == "") i.txt_status_self_a_click_date = "..................................";
i.txt_status_chief_a_click_date = MyHelper.GetDateStringForReport(p.status_chief_a_click_date);
if (i.txt_status_chief_a_click_date == "") i.txt_status_chief_a_click_date = "..................................";
return i;
}