From c5ebef07006ceaa8fa5f08a89ea1414de07be646 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Thu, 18 Feb 2021 10:39:48 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9B=E0=B8=B1?= =?UTF-8?q?=E0=B8=8D=E0=B8=AB=E0=B8=B2=E0=B8=95=E0=B8=B2=E0=B8=A1=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B9=80=E0=B8=9E=E0=B8=A5=E0=B8=87=E0=B9=81?= =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...reate_evaluation_detail_firstdocService.cs | 41 ++++++++++++++++--- ..._create_evaluation_detail_statusService.cs | 8 ++-- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs index 68d4194..c070cba 100644 --- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs +++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs @@ -145,14 +145,21 @@ namespace TodoAPI2.Models m_eva_create_evaluation_detail_agreement.chief, fk_eva_create_evaluationResult10.employee_id, fk_eva_create_evaluationResult10.supervisor1_id, - fk_eva_create_evaluationResult10.supervisor2_id), + fk_eva_create_evaluationResult10.supervisor2_id, + m_eva_create_evaluation_detail_agreement.employee_id, + m_eva_create_evaluation_detail_agreement.status_self_a, + m_eva_create_evaluation_detail_agreement.status_chief_a + ), role_desc = getRoleName(emp_id, m_eva_create_evaluation_detail_agreement.chief, m_eva_create_evaluation_detail_agreement.chief, fk_eva_create_evaluationResult10.employee_id, fk_eva_create_evaluationResult10.supervisor1_id, - fk_eva_create_evaluationResult10.supervisor2_id), + fk_eva_create_evaluationResult10.supervisor2_id, + m_eva_create_evaluation_detail_agreement.employee_id, + m_eva_create_evaluation_detail_agreement.status_self_a, + m_eva_create_evaluation_detail_agreement.status_chief_a), isActive = m_eva_create_evaluation_detail_agreement.isActive, Created = m_eva_create_evaluation_detail_agreement.created, @@ -163,8 +170,16 @@ namespace TodoAPI2.Models return data[0]; } - private string getRoleCode(int? emp_id, int? chief, int? supervisor1, int? supervisor2, int? supervisor1A, int? supervisor2A) + private string getRoleCode(int? emp_id, int? chief, int? supervisor1, int? supervisor2, int? supervisor1A, int? supervisor2A, int? self, + string status_self_a, string status_chief_a) { + if (emp_id == self && status_self_a != "Y") return ""; // ผู้รับการประเมิน + if (self == chief && emp_id == chief && status_chief_a != "Y") return "1"; + if (self == supervisor1 && emp_id == supervisor1 && status_chief_a == "Y") return "1"; + if (self == supervisor2 && emp_id == supervisor2 && status_chief_a == "Y") return "2"; + if (self == supervisor1A && emp_id == supervisor1A && status_chief_a == "Y") return "3"; + if (self == supervisor2A && emp_id == supervisor2A && status_chief_a == "Y") return "4"; + if (emp_id == chief) return "1"; else if (emp_id == supervisor1) return "1"; else if (emp_id == supervisor2) return "2"; @@ -173,8 +188,16 @@ namespace TodoAPI2.Models return ""; } - private string getRoleName(int? emp_id, int? chief, int? supervisor1, int? supervisor2, int? supervisor1A, int? supervisor2A) + private string getRoleName(int? emp_id, int? chief, int? supervisor1, int? supervisor2, int? supervisor1A, int? supervisor2A, int? self, + string status_self_a, string status_chief_a) { + if (emp_id == self && status_self_a != "Y") return ""; // ผู้รับการประเมิน + if (self == chief && emp_id == chief && status_chief_a != "Y") return "ผู้ประเมิน"; + if (self == supervisor1 && emp_id == supervisor1 && status_chief_a == "Y") return "ผู้ประเมิน"; + if (self == supervisor2 && emp_id == supervisor2 && status_chief_a == "Y") return "ผู้ประเมินสูงสุด"; + if (self == supervisor1A && emp_id == supervisor1A && status_chief_a == "Y") return "ผู้บังคับบัญชาเหนือขึ้นไป"; + if (self == supervisor2A && emp_id == supervisor2A && status_chief_a == "Y") return "ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)"; + if (emp_id == chief) return "ผู้ประเมิน"; else if (emp_id == supervisor1) return "ผู้ประเมิน"; else if (emp_id == supervisor2) return "ผู้ประเมินสูงสุด"; @@ -288,14 +311,20 @@ namespace TodoAPI2.Models m_eva_create_evaluation_detail_agreement.chief, fk_eva_create_evaluationResult10.employee_id, fk_eva_create_evaluationResult10.supervisor1_id, - fk_eva_create_evaluationResult10.supervisor2_id), + fk_eva_create_evaluationResult10.supervisor2_id, + m_eva_create_evaluation_detail_agreement.employee_id, + m_eva_create_evaluation_detail_agreement.status_self_a, + m_eva_create_evaluation_detail_agreement.status_chief_a), role_desc = getRoleName(emp_id, m_eva_create_evaluation_detail_agreement.chief, m_eva_create_evaluation_detail_agreement.chief, fk_eva_create_evaluationResult10.employee_id, fk_eva_create_evaluationResult10.supervisor1_id, - fk_eva_create_evaluationResult10.supervisor2_id), + fk_eva_create_evaluationResult10.supervisor2_id, + m_eva_create_evaluation_detail_agreement.employee_id, + m_eva_create_evaluation_detail_agreement.status_self_a, + m_eva_create_evaluation_detail_agreement.status_chief_a), isActive = m_eva_create_evaluation_detail_agreement.isActive, Created = m_eva_create_evaluation_detail_agreement.created, diff --git a/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs b/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs index 18bdea9..0971785 100644 --- a/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs +++ b/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs @@ -287,10 +287,10 @@ namespace TodoAPI2.Models noti_url = "/eva/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d2?id=" + existingEntity.id.ToString(); } - if (need_noti) - { - SendNotification(noti_to_employee_id, owner_eva_employee_id, existingEntity.id, noti_message, noti_url); - } + //if (need_noti) + //{ + // SendNotification(noti_to_employee_id, owner_eva_employee_id, existingEntity.id, noti_message, noti_url); + //} var updated = _repository.Update(id, existingEntity); return Get(updated.id);