From a108bbbc4a4c61d2121ece82b121bb8dbe2de690 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Thu, 26 Aug 2021 14:43:05 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=81?= =?UTF-8?q?=E0=B8=81=E0=B9=89=E0=B8=95=E0=B8=B2=E0=B8=A1=20https://app.cli?= =?UTF-8?q?ckup.com/t/e5gb58?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ApiControllers/rep_eva_xControllers.cs | 20 +++++++++++++++---- ...create_evaluation_detail_processService.cs | 14 ++++++++++++- ...on_detail_processWithSelectionViewModel.cs | 13 ++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs index 15394cc..715780c 100644 --- a/ApiControllers/rep_eva_xControllers.cs +++ b/ApiControllers/rep_eva_xControllers.cs @@ -296,6 +296,18 @@ namespace TodoAPI2.Controllers return data2; } + private string checkLevel(int? position_type_id, string position_level_text, string name) + { + if (position_type_id.HasValue) + { + if(position_type_id == 3 || position_type_id == 4 || position_type_id == 5) + { + return " " + position_level_text; + } + } + return ""; + } + private rep_eva_xInputModel2 GetParameter(int detail_id) { var i = new rep_eva_xInputModel2(); @@ -330,13 +342,13 @@ namespace TodoAPI2.Controllers } i.chief_fullname = p.chief_fullname; - i.chief_position = p.chief_position; + i.chief_position = p.chief_position + checkLevel(p.chief_position_type_id, p.chief_position_level_text, p.chief_fullname); i.supervisor2_fullname = p.supervisor2_fullname; - i.supervisor2_position = p.supervisor2_position; + i.supervisor2_position = p.supervisor2_position + checkLevel(p.supervisor2_position_type_id, p.supervisor2_position_level_text, p.supervisor2_fullname); i.supervisor1A_fullname = p.supervisor1A_fullname; - i.supervisor1A_position = p.supervisor1A_position; + i.supervisor1A_position = p.supervisor1A_position + checkLevel(p.supervisor1A_position_type_id, p.supervisor1A_position_level_text, p.supervisor1A_fullname); i.supervisor2A_fullname = p.supervisor2A_fullname; - i.supervisor2A_position = p.supervisor2A_position; + i.supervisor2A_position = p.supervisor2A_position + checkLevel(p.supervisor2A_position_type_id, p.supervisor2A_position_level_text, p.supervisor2A_fullname); i.main_dept = p.employee_main_dept; if (i.main_dept != null) i.main_dept = i.main_dept.Replace("กอง",""); diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs index 1e89064..836e64f 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs @@ -187,7 +187,19 @@ namespace TodoAPI2.Models isActive = m_eva_create_evaluation_detail_process.isActive, Created = m_eva_create_evaluation_detail_process.created, - Updated = m_eva_create_evaluation_detail_process.updated + Updated = m_eva_create_evaluation_detail_process.updated, + + supervisor2_position_type_id = fk_external_supervisor2.position_type_id, + supervisor1A_position_type_id = fk_external_supervisor1A.position_type_id, + supervisor2A_position_type_id = fk_external_supervisor2A.position_type_id, + employee_position_type_id = fk_external_employee.position_type_id, + chief_position_type_id = fk_external_chief.position_type_id, + + supervisor2_position_level_text = fk_external_supervisor2.position_level_text, + supervisor1A_position_level_text = fk_external_supervisor1A.position_level_text, + supervisor2A_position_level_text = fk_external_supervisor2A.position_level_text, + employee_position_level_text = fk_external_employee.position_level_text, + chief_position_level_text = fk_external_chief.position_level_text } ).ToList(); diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs index 46456cd..0646ac7 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs @@ -23,5 +23,18 @@ namespace TodoAPI2.Models public int? selected_round { get; set; } public int? fiscal_year { get; set; } + + public int? supervisor2_position_type_id { get; set; } + public int? supervisor1A_position_type_id { get; set; } + public int? supervisor2A_position_type_id { get; set; } + public int? employee_position_type_id { get; set; } + public int? chief_position_type_id { get; set; } + + public string supervisor2_position_level_text { get; set; } + public string supervisor1A_position_level_text { get; set; } + public string supervisor2A_position_level_text { get; set; } + public string employee_position_level_text { get; set; } + public string chief_position_level_text { get; set; } + } }