From 381369e3977cf2a743c46beb3108ab1b4f3affef Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Sun, 17 Jan 2021 11:34:56 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=95=E0=B8=A3=E0=B8=A7=E0=B8=88?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=20scan=20=E0=B8=99=E0=B8=B4?=
 =?UTF-8?q?=E0=B9=89=E0=B8=A7=E0=B8=88=E0=B8=B2=E0=B8=81=20timerecorder=5F?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_temp_fingerscan/eva_temp_fingerscanService.cs  |  1 +
 Models/external_employee/external_employeeService.cs   | 10 +++++++++-
 Models/external_employee/external_employeeViewModel.cs |  2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs b/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
index 507c93b..f6e9fd4 100644
--- a/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
+++ b/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs
@@ -253,6 +253,7 @@ namespace TodoAPI2.Models
             {
                 var theemp = (from e in all_emp
                           where ClearName(i.fullname) == ClearName(e.halfname)
+                          || (!string.IsNullOrEmpty(e.timerecorder_id) && e.timerecorder_id.Contains(i.badgenumber))
                           select e).FirstOrDefault();
                 if (theemp != null)
                 {
diff --git a/Models/external_employee/external_employeeService.cs b/Models/external_employee/external_employeeService.cs
index 329bd66..3531e6f 100644
--- a/Models/external_employee/external_employeeService.cs
+++ b/Models/external_employee/external_employeeService.cs
@@ -233,7 +233,7 @@ hpt.position_type_name,he.packing_date,he.cost_of_living,
    LIMIT 1) IS NOT null THEN 'ช่วยปฎิบัติหน้าที่'
 ELSE null END) as remark_hrm_work_record,
 
-org_type_depart.department_degree_id
+org_type_depart.department_degree_id, he.timerecorder_id
 
 from public.hrm_employees as he
 left join public.hrm_position_types as hpt on he.position_type_id=hpt.id
@@ -339,6 +339,14 @@ order by he.firstname, he.lastname;
                 {
                     i.remark_hrm_work_record = dr["remark_hrm_work_record"].ToString();
                 }
+                if (dr["timerecorder_id"] != DBNull.Value)
+                {
+                    i.timerecorder_id = dr["timerecorder_id"].ToString();
+                }
+                else
+                {
+                    i.timerecorder_id = "";
+                }
 
                 result.Add(i);
             }
diff --git a/Models/external_employee/external_employeeViewModel.cs b/Models/external_employee/external_employeeViewModel.cs
index e8c9a39..8ee2d9f 100644
--- a/Models/external_employee/external_employeeViewModel.cs
+++ b/Models/external_employee/external_employeeViewModel.cs
@@ -56,6 +56,8 @@ namespace TodoAPI2.Models
         public decimal? other_money { get; set; }
         public string profile_picture { get; set; }
 
+        public string timerecorder_id { get; set; }
+
         public int? worked_month // ทำงานมาแล้วกี่เดือน
         {
             get