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-21 13:43:48 +07:00
parent 31f21f24ad
commit 707fcfd278
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
View File

@@ -136,10 +136,14 @@ namespace TodoAPI2.Models
into external_linkageResult2 into external_linkageResult2
from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty() from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty()
join sort_dep in ext.GetSortingDep() on fk_external_linkageResult2.department_id equals sort_dep.id join sort_dep in ext.GetSortingDep() on m_eva_adjust_postponement_detail_normal_02.org_at_this_time.HasValue ? m_eva_adjust_postponement_detail_normal_02.org_at_this_time : fk_external_linkageResult2.department_id equals sort_dep.id
into sort_depResult2 into sort_depResult2
from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty() from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
join sort_dep2 in ext.GetSortingDep() on m_eva_adjust_postponement_detail_normal_02.org_at_this_time equals sort_dep2.id
into external_linkageResult11
from fk_external_linkageResult11 in sort_depResult2.DefaultIfEmpty()
//join create_detail in _repository.Context.eva_create_evaluation_detail //join create_detail in _repository.Context.eva_create_evaluation_detail
//on fk_eva_adjust_postponementResult1.create_evaluation_id equals create_detail.create_evaluation_id //on fk_eva_adjust_postponementResult1.create_evaluation_id equals create_detail.create_evaluation_id
//into create_detailResult //into create_detailResult
@@ -154,6 +158,9 @@ namespace TodoAPI2.Models
orderby orderby
fk_sort_depResult2.external_code, fk_sort_depResult2.external_code,
m_eva_adjust_postponement_detail_normal_02.org_at_this_time.HasValue ? 1 : 0,
//fk_external_linkageResult2.department_degree_id, //fk_external_linkageResult2.department_degree_id,
//fk_external_linkageResult2.department_code, //fk_external_linkageResult2.department_code,
fk_external_linkageResult2.hpt_position_type_id, fk_external_linkageResult2.hpt_position_type_id,
@@ -184,7 +191,7 @@ namespace TodoAPI2.Models
total_score = m_eva_adjust_postponement_detail_normal_02.migration_total_score.HasValue ? m_eva_adjust_postponement_detail_normal_02.migration_total_score : m_eva_adjust_postponement_detail_normal_02.score_final, total_score = m_eva_adjust_postponement_detail_normal_02.migration_total_score.HasValue ? m_eva_adjust_postponement_detail_normal_02.migration_total_score : m_eva_adjust_postponement_detail_normal_02.score_final,
eva_result = !string.IsNullOrEmpty(m_eva_adjust_postponement_detail_normal_02.migration_eva_result) ? m_eva_adjust_postponement_detail_normal_02.migration_eva_result : m_eva_adjust_postponement_detail_normal_02.level_score_final, eva_result = !string.IsNullOrEmpty(m_eva_adjust_postponement_detail_normal_02.migration_eva_result) ? m_eva_adjust_postponement_detail_normal_02.migration_eva_result : m_eva_adjust_postponement_detail_normal_02.level_score_final,
emp_department_name = fk_external_linkageResult2.department_name, emp_department_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_sort_depResult2.external_name,
adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year, adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year,
position_allowance = fk_external_linkageResult2.position_allowance, position_allowance = fk_external_linkageResult2.position_allowance,