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

แก้ไข https://app.clickup.com/t/cqx9eg

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-09-01 16:32:23 +07:00
parent f1dad78f66
commit 095d8b1a60
6 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Models/external_employee/external_employeeService.cs
View File

@@ -97,7 +97,7 @@ ELSE null END) as remark_hrm_work_record,
org_type_depart.department_degree_id, he.timerecorder_id,
(select count(*) from hrm_resigns where hrm_resigns.employee_id = he.employee_id) as count_resigns,
he.workingstatus
he.workingstatus, cylinder.salary_max, cylinder.themax
from public.hrm_employees as he
left join public.hrm_position_types as hpt on he.position_type_id=hpt.id
@@ -110,6 +110,7 @@ left join public.hrm_employee_types as het on het.id = he.employee_type_id
left join public.users as u on u.employee_id = he.employee_id
left join public.org_type_departments as org_type_depart on orgdata.department_type_id = org_type_depart.id
left join public.org_type_department_colors as org_depart_color on org_type_depart.department_degree_id = org_depart_color.id
left join eva_salary_cylinder as cylinder on cylinder.position_type=he.position_type_id and cylinder.position_level=he.position_level_id
left join (select orgdata.id,orgdata2.id as id2,
case when orgdata2.department_name is not null then
concat(orgdata2.department_name,' - ',orgdata.department_name)
@@ -245,6 +246,14 @@ order by sorting_dep.sort_order, hpt.position_type_id, hpl.position_level_id, em
i.count_resigns = 0;
}
i.workingstatus = dr["workingstatus"].ToString();
if (dr["salary_max"] != DBNull.Value)
{
i.salary_max = Convert.ToDecimal(dr["salary_max"]);
}
if (dr["themax"] != DBNull.Value)
{
i.themax = Convert.ToDecimal(dr["themax"]);
}
result.Add(i);
}