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

fix op 2782

Browse Source
This commit is contained in:
Prathan B
2020-07-10 14:05:10 +07:00
parent d8d671dd51
commit e4549c118f
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
View File

@@ -126,7 +126,8 @@ namespace TodoAPI2.Models
adjust_postponement_id = m_eva_adjust_postponement_detail_normal_02.adjust_postponement_id, adjust_postponement_id = m_eva_adjust_postponement_detail_normal_02.adjust_postponement_id,
employee_id = m_eva_adjust_postponement_detail_normal_02.employee_id, employee_id = m_eva_adjust_postponement_detail_normal_02.employee_id,
sarary = m_eva_adjust_postponement_detail_normal_02.sarary, sarary = m_eva_adjust_postponement_detail_normal_02.sarary,
cost_living = m_eva_adjust_postponement_detail_normal_02.cost_living, // cost_living = m_eva_adjust_postponement_detail_normal_02.cost_living,
cost_living = fk_external_linkageResult2.cost_of_living,
middle = m_eva_adjust_postponement_detail_normal_02.middle, middle = m_eva_adjust_postponement_detail_normal_02.middle,
promoted_percentage = m_eva_adjust_postponement_detail_normal_02.promoted_percentage, promoted_percentage = m_eva_adjust_postponement_detail_normal_02.promoted_percentage,
total_promote = m_eva_adjust_postponement_detail_normal_02.total_promote, total_promote = m_eva_adjust_postponement_detail_normal_02.total_promote,

9
Models/external_employee/external_employeeService.cs
View File

@@ -72,8 +72,7 @@ CONCAT(he.firstname,he.lastname) as halfname,
orgdata.id as department_id,orgdata.department_name,orgdata.department_code,he.salary, orgdata.id as department_id,orgdata.department_name,orgdata.department_code,he.salary,
he.employee_type_id, het.employee_type_name,opd.position_id as position_id, he.employee_type_id, het.employee_type_name,opd.position_id as position_id,
u.email as user_email, u.id as user_id,hpl.position_level_name,he.position_level_id, u.email as user_email, u.id as user_id,hpl.position_level_name,he.position_level_id,
he.position_type_id,hpt.position_type_name,he.packing_date, he.position_type_id,hpt.position_type_name,he.packing_date,he.cost_of_living,
(CASE WHEN (SELECT hrm_work_rec.id FROM hrm_working_records as hrm_work_rec (CASE WHEN (SELECT hrm_work_rec.id FROM hrm_working_records as hrm_work_rec
WHERE hrm_work_rec.employee_id = he.employee_id WHERE hrm_work_rec.employee_id = he.employee_id
AND hrm_work_rec.start_date <= now() AND hrm_work_rec.start_date <= now()
@@ -162,6 +161,12 @@ order by he.firstname, he.lastname;
{ {
i.salary = Convert.ToDecimal(dr["salary"]); i.salary = Convert.ToDecimal(dr["salary"]);
} }
i.cost_of_living = 0;
if (dr["cost_of_living"] != DBNull.Value)
{
i.cost_of_living = Convert.ToDecimal(dr["cost_of_living"]);
}
if (dr["packing_date"] != DBNull.Value) if (dr["packing_date"] != DBNull.Value)
{ {
i.packing_date = Convert.ToDateTime(dr["packing_date"]); i.packing_date = Convert.ToDateTime(dr["packing_date"]);

2
Models/external_employee/external_employeeViewModel.cs
View File

@@ -49,6 +49,8 @@ namespace TodoAPI2.Models
public DateTime? packing_date { get; set; } public DateTime? packing_date { get; set; }
public int? department_degree_id { get; set; } public int? department_degree_id { get; set; }
public string remark_hrm_work_record { get; set; } public string remark_hrm_work_record { get; set; }
public decimal? cost_of_living { get; set; }
public int? worked_month // ทำงานมาแล้วกี่เดือน public int? worked_month // ทำงานมาแล้วกี่เดือน
{ {