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

รวม code แก้ไข Change Request จากทีม

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-07-25 23:21:43 +07:00
parent fef57e2655
commit 565fa89be2
11 changed files with 146 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Models/external_employee/external_employeeService.cs
View File

@@ -71,8 +71,14 @@ CONCAT(htm.title_name,' ',he.firstname,' ',he.lastname) as fullname,opd.position
CONCAT(he.firstname,he.lastname) as halfname,
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,he.position_level_id,
he.position_type_id,hpt.position_type_name,he.packing_date,he.cost_of_living,
u.email as user_email, u.id as user_id,hpl.position_level_name,
he.position_level_id,
he.position_type_id,
hpl.position_level_id as hpl_position_level_id,
hpt.position_type_id as hpt_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
WHERE hrm_work_rec.employee_id = he.employee_id
AND hrm_work_rec.start_date <= now()
@@ -129,6 +135,7 @@ order by he.firstname, he.lastname;
{
i.position_type_id = Convert.ToInt32(dr["position_type_id"]);
i.position_type_name = dr["position_type_name"].ToString();
i.hpt_position_type_id = Convert.ToInt32(dr["hpt_position_type_id"]);
}
if (dr["position_id"] != DBNull.Value)
@@ -155,6 +162,7 @@ order by he.firstname, he.lastname;
{
i.position_level_id = Convert.ToInt32(dr["position_level_id"]);
i.position_level_text = dr["position_level_name"].ToString();
i.hpl_position_level_id = Convert.ToInt32(dr["hpl_position_level_id"]);
}
i.salary = 0;
if (dr["salary"] != DBNull.Value)

2
Models/external_employee/external_employeeViewModel.cs
View File

@@ -35,6 +35,7 @@ namespace TodoAPI2.Models
public int? employee_type_id { get; set; }
public int? position_id { get; set; }
public int? position_type_id { get; set; }
public int? hpt_position_type_id { get; set; }
public string position_type_name { get; set; }
public string user_email { get; set; }
public int? user_id { get; set; }
@@ -45,6 +46,7 @@ namespace TodoAPI2.Models
public string employee_type_name { get; set; }
public string employee_no { get; set; }
public int? position_level_id { get; set; }
public int? hpl_position_level_id { get; set; }
public string position_level_text { get; set; }
public DateTime? packing_date { get; set; }
public int? department_degree_id { get; set; }