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 Rientrakrunchai
2020-03-14 15:06:48 +07:00
parent 1c2857e977
commit 6135a2ec09
8 changed files with 141 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Models/external_employee/external_employeeService.cs
View File

@@ -69,7 +69,7 @@ where ha.employee_id = @emp_id and ha.workingstatus = 'สถานะปฏิ
select he.employee_id as id, mpn.position_number,he.employee_no,he.position_no,
CONCAT(htm.title_name,' ',he.firstname,' ',he.lastname) as fullname,opd.position_name,
orgdata.id as department_id,orgdata.department_name,orgdata.department_code,he.salary,
he.employee_type_id, het.employee_type_name,
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,hpl.position_level_id
from public.hrm_employees as he
left join public.hrm_position_levels as hpl on he.position_level_id = hpl.id
@@ -99,6 +99,12 @@ order by he.firstname,he.lastname;
i.employee_type_name = dr["employee_type_name"].ToString();
}
i.position_type_id = null;
if (dr["position_id"] != DBNull.Value)
{
i.position_id = Convert.ToInt32(dr["position_id"]);
}
if (dr["user_id"] != DBNull.Value)
{
i.user_email = dr["user_email"].ToString();
@@ -116,7 +122,7 @@ order by he.firstname,he.lastname;
}
if (dr["position_level_id"] != DBNull.Value)
{
i.position_level_id = Convert.ToInt32(dr["department_id"]);
i.position_level_id = Convert.ToInt32(dr["position_level_id"]);
i.position_level_text = dr["position_level_name"].ToString();
}
i.salary = 0;

2
Models/external_employee/external_employeeViewModel.cs
View File

@@ -23,6 +23,8 @@ namespace TodoAPI2.Models
public int? employee_type_id { get; set; }
public int? position_id { get; set; }
public int? position_type_id { get; set; }
public string user_email { get; set; }