diff --git a/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs b/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs index f44dcb5..da182a7 100644 --- a/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs +++ b/Models/eva_temp_fingerscan/eva_temp_fingerscanService.cs @@ -99,6 +99,27 @@ namespace TodoAPI2.Models return hour + ":" + minute; } + private string GetTimeWithSecStringForDB(DateTime d) + { + string hour = d.Hour.ToString(); + if (d.Hour < 10) + { + hour = "0" + hour; + } + string minute = d.Minute.ToString(); + if (d.Minute < 10) + { + minute = "0" + minute; + } + string second = d.Second.ToString(); + if(d.Second < 10) + { + second = "0" + second; + } + + return hour + ":" + minute + ":" + second; + } + public List GetListBySearch(eva_temp_fingerscanSearchModel model) { //var all_emp = emp.GetListByemployee_type(null, null); @@ -233,7 +254,8 @@ namespace TodoAPI2.Models if (theemp != null) { var id = theemp.id.ToString(); - var r2 = id.ToString() + "#" + GetDateStringForDB(i.checktime) + "#" + GetTimeStringForDB(i.checktime); + var r2 = id.ToString() + "#" + GetDateStringForDB(i.checktime) + "#" + GetTimeWithSecStringForDB(i.checktime) + + "#" + GetTimeStringForDB(i.checktime); var a = new input_finger(); a.data = r2; a.base64_img = i.base64img; @@ -254,8 +276,9 @@ namespace TodoAPI2.Models string employee_id = data[0]; string date = data[1]; string time = data[2]; + string time_old = data[3]; - string sql_checking = $"select employee_id,date,time from tad_time_attendances where employee_id={employee_id} and date='{date}' and time='{time}' "; + string sql_checking = $"select employee_id,date,time from tad_time_attendances where employee_id={employee_id} and date='{date}' and (time='{time}' or time='{time_old}') "; DataTable dt = db.ExecuteDataTableNpgsql(sql_checking, null); if (dt.Rows.Count == 0)