ปรับปรุง การอนุมัติแบบข้อตกลง ของ ผอ

This commit is contained in:
nakorn
2022-03-17 16:12:32 +07:00
parent f6afc23b45
commit 61f067f150
10 changed files with 70 additions and 29 deletions

View File

@@ -128,7 +128,7 @@ namespace TodoAPI2.Models
status_chief = m_eva_create_evaluation_detail_agreement.status_chief,
status_chief_a = m_eva_create_evaluation_detail_agreement.status_chief_a,
status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor,
status_supervisor_a = null,
status_supervisor_a = m_eva_create_evaluation_detail_agreement.status_supervisor_a,
org_id_external_linkage_external_name = fk_external_employee.department_name,
@@ -445,6 +445,7 @@ namespace TodoAPI2.Models
status_chief = m_eva_create_evaluation_detail_agreement.status_chief,
status_chief_a = m_eva_create_evaluation_detail_agreement.status_chief_a,
status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor,
status_supervisor_a = m_eva_create_evaluation_detail_agreement.status_supervisor_a,
org_id_external_linkage_external_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_external_linkageResult12.external_name,
@@ -453,6 +454,7 @@ namespace TodoAPI2.Models
status_self_a_click_date = m_eva_create_evaluation_detail_agreement.status_self_a_click_date,
status_chief_a_click_date = m_eva_create_evaluation_detail_agreement.status_chief_a_click_date,
status_supervisor_click_date = m_eva_create_evaluation_detail_agreement.status_supervisor_click_date,
status_supervisor_a_click_date = m_eva_create_evaluation_detail_agreement.status_supervisor_a_click_date,
plan_round_year = checkNull(fk_planResult.theTime) + "/" + checkNull(fk_planResult.fiscal_year),