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

รวม code จากทุกคน ที่แก้ไข op ล่าสุด

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-04-05 22:57:02 +07:00
parent 6135a2ec09
commit 9ffe9c30d3
46 changed files with 2636 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Models/external_employee/external_employeeService.cs
View File

@@ -70,8 +70,10 @@ 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,opd.position_id as position_id,
u.email as user_email, u.id as user_id,hpl.position_level_name,hpl.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
from public.hrm_employees as he
left join public.hrm_position_types as hpt on he.position_type_id=hpt.id
left join public.hrm_position_levels as hpl on he.position_level_id = hpl.id
left join public.mpp_position_numbers as mpn on he.position_no = mpn.id
left join public.org_position_datas as opd on opd.position_id = mpn.position_id
@@ -98,7 +100,12 @@ order by he.firstname,he.lastname;
i.employee_type_id = Convert.ToInt32(dr["employee_type_id"]);
i.employee_type_name = dr["employee_type_name"].ToString();
}
i.position_type_id = null;
if (dr["position_type_id"] != DBNull.Value)
{
i.position_type_id = Convert.ToInt32(dr["position_type_id"]);
i.position_type_name = dr["position_type_name"].ToString();
}
if (dr["position_id"] != DBNull.Value)
{
@@ -130,6 +137,10 @@ order by he.firstname,he.lastname;
{
i.salary = Convert.ToDecimal(dr["salary"]);
}
if (dr["packing_date"] != DBNull.Value)
{
i.packing_date = Convert.ToDateTime(dr["packing_date"]);
}
result.Add(i);
}
@@ -141,7 +152,7 @@ order by he.firstname,he.lastname;
var sql = @"
select he.employee_id as id, mpn.position_number, opd.position_name,
CONCAT(htm.title_name,' ',he.firstname,' ',he.lastname) as fullname,
u.email as user_email, u.id as user_id
u.email as user_email, u.id as user_id,u.name as fullname2
from public.hrm_employees as he
left join public.mpp_position_numbers as mpn on he.position_no = mpn.id
left join public.org_position_datas as opd on opd.position_id = mpn.position_id
@@ -164,14 +175,14 @@ and u.id=@user_id;
i.id = Convert.ToInt32(dr["id"]);
i.position_number = dr["position_number"].ToString();
i.position_name = dr["position_name"].ToString();
i.fullname = dr["fullname"].ToString();
i.fullname = dr["fullname2"].ToString();
i.employee_type_id = null;
i.position_type_id = null;
if(dr["user_id"] != DBNull.Value)
if (dr["user_id"] != DBNull.Value)
{
i.user_email = dr["user_email"].ToString();
i.user_id = Convert.ToInt32(dr["user_id"]);
}
}
result.Add(i);
}