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

21
Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
View File

@@ -254,6 +254,10 @@ namespace TodoAPI2.Models
into external_employeeResult
from fk_external_employee in external_employeeResult.DefaultIfEmpty()
join sort_dep in ext.GetSortingDep() on m_eva_create_evaluation_detail_agreement.help_org_id.HasValue? m_eva_create_evaluation_detail_agreement.help_org_id : fk_external_employee.department_id equals sort_dep.id
into sort_depResult2
from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
join fk_external_chief in allemp on m_eva_create_evaluation_detail_agreement.chief equals fk_external_chief.id
into external_chiefResult
from fk_external_chief in external_chiefResult.DefaultIfEmpty()
@@ -266,6 +270,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_agreement.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_agreement.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue)
&& (fk_external_employee.department_id == model.org_id || !model.org_id.HasValue)
@@ -273,7 +281,16 @@ namespace TodoAPI2.Models
&& (fk_external_employee.fullname.Contains(model.search_employee_fullname) || string.IsNullOrEmpty(model.search_employee_fullname))
&& (m_eva_create_evaluation_detail_agreement.employee_id == emp_id || m_eva_create_evaluation_detail_agreement.chief == emp_id)
orderby m_eva_create_evaluation_detail_agreement.created descending
orderby
fk_sort_depResult2.external_code,
//fk_external_employee.department_degree_id,
//fk_external_employee.department_code,
(!string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? 1 : 0),
fk_external_employee.hpt_position_type_id,
fk_external_employee.hpl_position_level_id,
fk_external_employee.employee_no
select new eva_create_evaluation_detail_firstdocViewModel()
{
id = m_eva_create_evaluation_detail_agreement.id,
@@ -296,7 +313,7 @@ namespace TodoAPI2.Models
status_chief_a = m_eva_create_evaluation_detail_agreement.status_chief_a,
status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor,
org_id_external_linkage_external_name = fk_external_employee.department_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_click_date = m_eva_create_evaluation_detail_agreement.status_self_click_date,
status_chief_click_date = m_eva_create_evaluation_detail_agreement.status_chief_click_date,