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

ปรับปรุงวันที่่ลาใน report

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-08-27 13:58:44 +07:00
parent 8735c12bd7
commit e91666e9db
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApiControllers/rep_eva_xControllers.cs
View File

@@ -355,7 +355,7 @@ namespace TodoAPI2.Controllers
if (i.main_dept != null) i.main_dept = i.main_dept.Replace("กอง",""); 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.leave_period = MyHelper.GetDateStringForReport(p.leave_start_date) + " ถึง " + MyHelper.GetDateStringForReport(p.leave_end_date);
i.selected_round = p.selected_round; i.selected_round = p.selected_round;
var context = _process.GetDataContext(); var context = _process.GetDataContext();
@@ -402,9 +402,9 @@ namespace TodoAPI2.Controllers
i.w1 = p.create_evaluation_score1; i.w1 = p.create_evaluation_score1;
i.w2 = p.create_evaluation_score2; i.w2 = p.create_evaluation_score2;
if(p.start_date.HasValue && p.end_date.HasValue) if(p.leave_start_date.HasValue && p.leave_end_date.HasValue)
{ {
var q = emp.GetLeaveOfEmployee(p.employee_id.Value, p.start_date, p.end_date); var q = emp.GetLeaveOfEmployee(p.employee_id.Value, p.leave_start_date, p.leave_end_date);
i.sum_day_sick_leave = q.sum_day_sick_leave; i.sum_day_sick_leave = q.sum_day_sick_leave;
i.count_sick_leave = q.count_sick_leave; i.count_sick_leave = q.count_sick_leave;
i.sum_day_personal_leave = q.sum_day_personal_leave; i.sum_day_personal_leave = q.sum_day_personal_leave;

12
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -89,6 +89,13 @@ namespace TodoAPI2.Models
var start_date = getPlanStart(plan_id); var start_date = getPlanStart(plan_id);
var end_date = getPlanEnd(plan_id); var end_date = getPlanEnd(plan_id);
var plan = (from i in _repository.Context.eva_performance_plan
where i.id == plan_id
select i).FirstOrDefault();
var leave_start_date = plan.start_leave;
var leave_end_date = plan.end_leave;
var data = ( var data = (
from m_eva_create_evaluation_detail_process in _repository.Context.eva_create_evaluation_detail from m_eva_create_evaluation_detail_process in _repository.Context.eva_create_evaluation_detail
@@ -199,7 +206,10 @@ namespace TodoAPI2.Models
supervisor1A_position_level_text = fk_external_supervisor1A.position_level_text, supervisor1A_position_level_text = fk_external_supervisor1A.position_level_text,
supervisor2A_position_level_text = fk_external_supervisor2A.position_level_text, supervisor2A_position_level_text = fk_external_supervisor2A.position_level_text,
employee_position_level_text = fk_external_employee.position_level_text, employee_position_level_text = fk_external_employee.position_level_text,
chief_position_level_text = fk_external_chief.position_level_text chief_position_level_text = fk_external_chief.position_level_text,
leave_start_date = leave_start_date,
leave_end_date = leave_end_date
} }
).ToList(); ).ToList();

3
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs
View File

@@ -36,5 +36,8 @@ namespace TodoAPI2.Models
public string employee_position_level_text { get; set; } public string employee_position_level_text { get; set; }
public string chief_position_level_text { get; set; } public string chief_position_level_text { get; set; }
public DateTime? leave_start_date { get; set; }
public DateTime? leave_end_date { get; set; }
} }
} }