เพิ่มการตรวจการ scan นิ้วจาก timerecorder_id
This commit is contained in:
@@ -253,6 +253,7 @@ namespace TodoAPI2.Models
|
|||||||
{
|
{
|
||||||
var theemp = (from e in all_emp
|
var theemp = (from e in all_emp
|
||||||
where ClearName(i.fullname) == ClearName(e.halfname)
|
where ClearName(i.fullname) == ClearName(e.halfname)
|
||||||
|
|| (!string.IsNullOrEmpty(e.timerecorder_id) && e.timerecorder_id.Contains(i.badgenumber))
|
||||||
select e).FirstOrDefault();
|
select e).FirstOrDefault();
|
||||||
if (theemp != null)
|
if (theemp != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -233,7 +233,7 @@ hpt.position_type_name,he.packing_date,he.cost_of_living,
|
|||||||
LIMIT 1) IS NOT null THEN 'ช่วยปฎิบัติหน้าที่'
|
LIMIT 1) IS NOT null THEN 'ช่วยปฎิบัติหน้าที่'
|
||||||
ELSE null END) as remark_hrm_work_record,
|
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
|
from public.hrm_employees as he
|
||||||
left join public.hrm_position_types as hpt on he.position_type_id=hpt.id
|
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();
|
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);
|
result.Add(i);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,6 +56,8 @@ namespace TodoAPI2.Models
|
|||||||
public decimal? other_money { get; set; }
|
public decimal? other_money { get; set; }
|
||||||
public string profile_picture { get; set; }
|
public string profile_picture { get; set; }
|
||||||
|
|
||||||
|
public string timerecorder_id { get; set; }
|
||||||
|
|
||||||
public int? worked_month // ทำงานมาแล้วกี่เดือน
|
public int? worked_month // ทำงานมาแล้วกี่เดือน
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|||||||
Reference in New Issue
Block a user