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-06 15:25:50 +07:00
parent 4844a0ad44
commit 58cc8018af
5 changed files with 60 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -246,7 +246,7 @@ namespace TodoAPI2.Models
into external_employeeResult
from fk_external_employee in external_employeeResult.DefaultIfEmpty()
join sort_dep in ext.GetSortingDep() on fk_external_employee.department_id equals sort_dep.id
join sort_dep in ext.GetSortingDep() on m_eva_create_evaluation_detail_process.help_org_id.HasValue ? m_eva_create_evaluation_detail_process.help_org_id : fk_external_employee.department_id equals sort_dep.id
into sort_depResult2
from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
@@ -262,6 +262,10 @@ namespace TodoAPI2.Models
into planResult
from fk_planResult in planResult.DefaultIfEmpty()
join fk_external_linkage11 in ext.GetDepartmentData() on m_eva_create_evaluation_detail_process.help_org_id equals fk_external_linkage11.id
into external_linkageResult11
from fk_external_linkageResult11 in external_linkageResult11.DefaultIfEmpty()
where 1 == 1
&& (m_eva_create_evaluation_detail_process.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue)
&& (all_org_id.Contains(fk_external_employee.department_id) || !model.org_id.HasValue)
@@ -301,7 +305,7 @@ namespace TodoAPI2.Models
search_employee_code = fk_external_employee.employee_no,
search_employee_fullname = fk_external_employee.fullname,
org_id_external_linkage_external_name = fk_sort_depResult2.external_name,
org_id_external_linkage_external_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_external_employee.department_name,
status_self = m_eva_create_evaluation_detail_process.status_self,
status_chief = m_eva_create_evaluation_detail_process.status_chief,