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

รวม code ปรับหน้าจอ ให้เรียงตามทะเบียนประวัติ

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-16 11:45:33 +07:00
parent 0340a3ae5d
commit 9df224d42d
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs
View File

@@ -114,11 +114,21 @@ namespace TodoAPI2.Models
join fk_external_linkage25 in ext.GetAgreeDisagree() on m_eva_create_evaluation_detail.supervisor2_result equals fk_external_linkage25.external_code join fk_external_linkage25 in ext.GetAgreeDisagree() on m_eva_create_evaluation_detail.supervisor2_result equals fk_external_linkage25.external_code
into external_linkageResult25 into external_linkageResult25
from fk_external_linkageResult25 in external_linkageResult25.DefaultIfEmpty() from fk_external_linkageResult25 in external_linkageResult25.DefaultIfEmpty()
join sort_dep in ext.GetSortingDep() on fk_external_linkageResult2.department_id equals sort_dep.id
into sort_depResult2
from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
where 1 ==1 where 1 ==1
&& (m_eva_create_evaluation_detail.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue) && (m_eva_create_evaluation_detail.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue)
orderby fk_external_linkageResult2.department_code, fk_external_linkageResult2.position_level_id orderby
fk_sort_depResult2.external_code,
//fk_external_linkageResult2.department_degree_id,
//fk_external_linkageResult2.department_code,
fk_external_linkageResult2.hpt_position_type_id,
fk_external_linkageResult2.hpl_position_level_id,
fk_external_linkageResult2.employee_no
select new eva_create_evaluation_detailViewModel() select new eva_create_evaluation_detailViewModel()
{ {
id = m_eva_create_evaluation_detail.id, id = m_eva_create_evaluation_detail.id,

12
Models/eva_evaluation_group_detail/eva_evaluation_group_detailService.cs
View File

@@ -113,13 +113,19 @@ namespace TodoAPI2.Models
into external_employeeResult into external_employeeResult
from fk_external_employeeResult in external_employeeResult.DefaultIfEmpty() from fk_external_employeeResult in external_employeeResult.DefaultIfEmpty()
join sort_dep in ext.GetSortingDep() on fk_external_employeeResult.department_id equals sort_dep.id
into sort_depResult2
from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
where 1==1 where 1==1
&& (m_eva_evaluation_group_detail.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue) && (m_eva_evaluation_group_detail.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue)
orderby orderby
fk_external_employeeResult.department_degree_id, fk_sort_depResult2.external_code,
fk_external_employeeResult.department_code, //fk_external_employeeResult.department_degree_id,
fk_external_employeeResult.position_level_id, //fk_external_employeeResult.department_code,
fk_external_employeeResult.hpt_position_type_id,
fk_external_employeeResult.hpl_position_level_id,
fk_external_employeeResult.employee_no fk_external_employeeResult.employee_no
select new eva_evaluation_group_detailViewModel() select new eva_evaluation_group_detailViewModel()
{ {