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

6
Models/search_employee_for_group/search_employee_for_groupService.cs
View File

@@ -39,7 +39,7 @@ namespace TodoAPI2.Models
public search_employee_for_groupWithSelectionViewModel GetBlankItem()
{
var i = new search_employee_for_groupWithSelectionViewModel();
i.item_position_id = (from x in ext.Gethrm_position_types() orderby x.external_name select x).ToList();
i.item_position_id = (from x in ext.GetPositionForReport() orderby x.external_name select x).ToList();
i.item_org_id = (from x in ext.GetDepartmentData() orderby x.external_name select x).ToList();
@@ -63,7 +63,7 @@ namespace TodoAPI2.Models
where 1 == 1
&& (string.IsNullOrEmpty(model.employee_number) || (!string.IsNullOrEmpty(model.employee_number) && m_search_employee_for_group.employee_no.Contains(model.employee_number)))
&& (string.IsNullOrEmpty(model.fullname) || (!string.IsNullOrEmpty(model.fullname) && m_search_employee_for_group.fullname.Contains(model.fullname)))
&& (m_search_employee_for_group.position_type_id == model.position_id || !model.position_id.HasValue)
&& (m_search_employee_for_group.position_id == model.position_id || !model.position_id.HasValue)
&& (m_search_employee_for_group.department_id == model.org_id || !model.org_id.HasValue)
orderby m_search_employee_for_group.fullname
@@ -72,7 +72,7 @@ namespace TodoAPI2.Models
id = m_search_employee_for_group.id,
employee_number = m_search_employee_for_group.employee_no,
fullname = m_search_employee_for_group.fullname,
position_id = m_search_employee_for_group.position_type_id,
position_id = m_search_employee_for_group.position_id,
level_name = m_search_employee_for_group.position_level_text,
org_id = m_search_employee_for_group.department_id,
remark = m_search_employee_for_group.user_email,