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

รวม code แก้ไข Change Request จากทีม

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-07-25 23:21:43 +07:00
parent fef57e2655
commit 565fa89be2
11 changed files with 146 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
View File

@@ -104,6 +104,10 @@ namespace TodoAPI2.Models
into external_linkageResult2
from fk_external_linkageResult2 in external_linkageResult2.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()
join create_detail in _repository.Context.eva_create_evaluation_detail
on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id
into create_detailResult
@@ -114,9 +118,12 @@ namespace TodoAPI2.Models
&& (m_eva_adjust_postponement_detail_quota_02.adjust_postponement_quota_id == model.adjust_postponement_quota_id || !model.adjust_postponement_quota_id.HasValue)
&& (fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_quota_02.employee_id || fk_create_detailResult == null)
orderby fk_external_linkageResult2.department_degree_id,
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_adjust_postponement_detail_quota_02ViewModel()
{
@@ -138,7 +145,7 @@ namespace TodoAPI2.Models
emp_fullname = fk_external_linkageResult2.fullname,
emp_position = fk_external_linkageResult2.position_name,
emp_level = fk_external_linkageResult2.position_level_text,
emp_department_name = fk_external_linkageResult2.department_name,
emp_department_name = fk_sort_depResult2.external_name,
total_score = fk_create_detailResult.score_supervisor,
eva_result = fk_create_detailResult.level_score_supervisor,