From e227b87af496566bf3c5c1f1cc6daf2389c981fa Mon Sep 17 00:00:00 2001
From: "LAPTOP-KB8JC2K2\\acer" <nakorn@tonproject.com>
Date: Fri, 9 Apr 2021 14:10:41 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B9=82=E0=B8=84=E0=B8=A7=E0=B8=95=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_adjust_postponement_detail_normal_02Service.cs        | 1 +
 .../eva_adjust_postponement_detail_quota_02Service.cs         | 1 +
 Models/external_employee/external_employeeService.cs          | 4 +++-
 Models/external_employee/external_employeeViewModel.cs        | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
index c06f958..d3e2c99 100644
--- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
+++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs
@@ -150,6 +150,7 @@ namespace TodoAPI2.Models
                 && (m_eva_adjust_postponement_detail_normal_02.adjust_postponement_id == model.adjust_postponement_id || !model.adjust_postponement_id.HasValue)
                 //&& fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_normal_02.employee_id
                 && (m_eva_adjust_postponement_detail_normal_02.is_for_postponement == null?true: m_eva_adjust_postponement_detail_normal_02.is_for_postponement.Value)
+                && fk_external_linkageResult2.workingstatus == "สถานะปฏิบัติงาน"
 
                 orderby
                 fk_sort_depResult2.external_code,
diff --git a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
index 135433a..67f5931 100644
--- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
+++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
@@ -168,6 +168,7 @@ namespace TodoAPI2.Models
                 && (fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_quota_02.employee_id || fk_create_detailResult == null)
 
                 && (m_eva_adjust_postponement_detail_quota_02.is_for_postponement == null ? true : m_eva_adjust_postponement_detail_quota_02.is_for_postponement.Value)
+                && fk_external_linkageResult2.workingstatus == "สถานะปฏิบัติงาน"
 
                 orderby
                 fk_sort_depResult2.external_code,
diff --git a/Models/external_employee/external_employeeService.cs b/Models/external_employee/external_employeeService.cs
index 356faf3..5219c26 100644
--- a/Models/external_employee/external_employeeService.cs
+++ b/Models/external_employee/external_employeeService.cs
@@ -96,7 +96,8 @@ hpt.position_type_name,he.packing_date,he.cost_of_living,
 ELSE null END) as remark_hrm_work_record,
 
 org_type_depart.department_degree_id, he.timerecorder_id,
-(select count(*) from hrm_resigns where hrm_resigns.employee_id = he.employee_id) as count_resigns
+(select count(*) from hrm_resigns where hrm_resigns.employee_id = he.employee_id) as count_resigns,
+he.workingstatus
 
 from public.hrm_employees as he
 left join public.hrm_position_types as hpt on he.position_type_id=hpt.id
@@ -243,6 +244,7 @@ order by sorting_dep.sort_order, hpt.position_type_id, hpl.position_level_id, em
                 {
                     i.count_resigns = 0;
                 }
+                i.workingstatus = dr["workingstatus"].ToString();
 
                 result.Add(i);
             }
diff --git a/Models/external_employee/external_employeeViewModel.cs b/Models/external_employee/external_employeeViewModel.cs
index 00bb673..d79f341 100644
--- a/Models/external_employee/external_employeeViewModel.cs
+++ b/Models/external_employee/external_employeeViewModel.cs
@@ -71,6 +71,8 @@ namespace TodoAPI2.Models
         public string timerecorder_id { get; set; }
         public int count_resigns { get; set; }
 
+        public string workingstatus { get; set; }
+
         public int? worked_month // ทำงานมาแล้วกี่เดือน
         {
             get