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

ปรับปรุงหลายส่วน

Browse Source
This commit is contained in:
nakorn
2021-11-15 13:53:13 +07:00
parent 6d0a2ace7d
commit 4b98790d2e
27 changed files with 2690 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Models/eva_create_evaluation/eva_create_evaluationService.cs
View File

@@ -76,6 +76,7 @@ namespace TodoAPI2.Models
i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList();
i.item_supervisor1_id = all_emp;
i.item_supervisor2_id = all_emp;
i.item_supervisor3_id = all_emp;
return i;
}
@@ -89,6 +90,7 @@ namespace TodoAPI2.Models
i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList();
i.item_supervisor1_id = all_emp;
i.item_supervisor2_id = all_emp;
i.item_supervisor3_id = all_emp;
return i;
}
@@ -127,6 +129,10 @@ namespace TodoAPI2.Models
into external_linkageResult7
from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty()
join fk_external_linkage8 in all_emp on m_eva_create_evaluation.supervisor3_id equals fk_external_linkage8.id
into external_linkageResult8
from fk_external_linkageResult8 in external_linkageResult8.DefaultIfEmpty()
where 1==1
&& (m_eva_create_evaluation.performance_plan_id == model.performance_plan_id || !model.performance_plan_id.HasValue)
&& (m_eva_create_evaluation.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue)
@@ -143,6 +149,7 @@ namespace TodoAPI2.Models
evaluation_group_id = m_eva_create_evaluation.evaluation_group_id,
supervisor1_id = m_eva_create_evaluation.supervisor1_id,
supervisor2_id = m_eva_create_evaluation.supervisor2_id,
supervisor3_id = m_eva_create_evaluation.supervisor3_id,
performance_plan_id_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.display_text,
employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
@@ -150,6 +157,7 @@ namespace TodoAPI2.Models
evaluation_group_id_eva_evaluation_group_name = fk_eva_evaluation_groupResult5.thegroup,
supervisor1_id_external_linkage_external_name = fk_external_linkageResult6.fullname,
supervisor2_id_external_linkage_external_name = fk_external_linkageResult7.fullname,
supervisor3_id_external_linkage_external_name = fk_external_linkageResult8.fullname,
isActive = m_eva_create_evaluation.isActive,
Created = m_eva_create_evaluation.created,
@@ -209,7 +217,7 @@ namespace TodoAPI2.Models
existingEntity.evaluation_group_id = model.evaluation_group_id;
existingEntity.supervisor1_id = model.supervisor1_id;
existingEntity.supervisor2_id = model.supervisor2_id;
existingEntity.supervisor3_id = model.supervisor3_id;
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
@@ -234,7 +242,7 @@ namespace TodoAPI2.Models
existingEntity.evaluation_group_id = i.evaluation_group_id;
existingEntity.supervisor1_id = i.supervisor1_id;
existingEntity.supervisor2_id = i.supervisor2_id;
existingEntity.supervisor3_id = i.supervisor3_id;
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}