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

แก้หน้าโควต้า และปรับเลื่อน

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-04-09 14:10:41 +07:00
parent 3d5af3beac
commit e227b87af4
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
View File

@@ -150,6 +150,7 @@ namespace TodoAPI2.Models
&& (m_eva_adjust_postponement_detail_normal_02.adjust_postponement_id == model.adjust_postponement_id || !model.adjust_postponement_id.HasValue) && (m_eva_adjust_postponement_detail_normal_02.adjust_postponement_id == model.adjust_postponement_id || !model.adjust_postponement_id.HasValue)
//&& fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_normal_02.employee_id //&& fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_normal_02.employee_id
&& (m_eva_adjust_postponement_detail_normal_02.is_for_postponement == null?true: m_eva_adjust_postponement_detail_normal_02.is_for_postponement.Value) && (m_eva_adjust_postponement_detail_normal_02.is_for_postponement == null?true: m_eva_adjust_postponement_detail_normal_02.is_for_postponement.Value)
&& fk_external_linkageResult2.workingstatus == "สถานะปฏิบัติงาน"
orderby orderby
fk_sort_depResult2.external_code, fk_sort_depResult2.external_code,

1
Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
View File

@@ -168,6 +168,7 @@ namespace TodoAPI2.Models
&& (fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_quota_02.employee_id || fk_create_detailResult == null) && (fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_quota_02.employee_id || fk_create_detailResult == null)
&& (m_eva_adjust_postponement_detail_quota_02.is_for_postponement == null ? true : m_eva_adjust_postponement_detail_quota_02.is_for_postponement.Value) && (m_eva_adjust_postponement_detail_quota_02.is_for_postponement == null ? true : m_eva_adjust_postponement_detail_quota_02.is_for_postponement.Value)
&& fk_external_linkageResult2.workingstatus == "สถานะปฏิบัติงาน"
orderby orderby
fk_sort_depResult2.external_code, fk_sort_depResult2.external_code,

4
Models/external_employee/external_employeeService.cs
View File

@@ -96,7 +96,8 @@ hpt.position_type_name,he.packing_date,he.cost_of_living,
ELSE null END) as remark_hrm_work_record, ELSE null END) as remark_hrm_work_record,
org_type_depart.department_degree_id, he.timerecorder_id, 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 (select count(*) from hrm_resigns where hrm_resigns.employee_id = he.employee_id) as count_resigns,
he.workingstatus
from public.hrm_employees as he 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_types as hpt on he.position_type_id=hpt.id
@@ -243,6 +244,7 @@ order by sorting_dep.sort_order, hpt.position_type_id, hpl.position_level_id, em
{ {
i.count_resigns = 0; i.count_resigns = 0;
} }
i.workingstatus = dr["workingstatus"].ToString();
result.Add(i); result.Add(i);
} }

2
Models/external_employee/external_employeeViewModel.cs
View File

@@ -71,6 +71,8 @@ namespace TodoAPI2.Models
public string timerecorder_id { get; set; } public string timerecorder_id { get; set; }
public int count_resigns { get; set; } public int count_resigns { get; set; }
public string workingstatus { get; set; }
public int? worked_month // ทำงานมาแล้วกี่เดือน public int? worked_month // ทำงานมาแล้วกี่เดือน
{ {
get get