|
@@ -169,7 +169,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/// <summary> |
|
|
/// <summary> |
|
|
/// 考勤打卡 |
|
|
|
|
|
|
|
|
/// 考勤打卡教师 |
|
|
/// </summary> |
|
|
/// </summary> |
|
|
/// <returns></returns> |
|
|
/// <returns></returns> |
|
|
public bool ClockIn(decimal ALon, decimal ALat, bool AIsOut, string ARemark, string ADPhoto, string ClockPlace) |
|
|
public bool ClockIn(decimal ALon, decimal ALat, bool AIsOut, string ARemark, string ADPhoto, string ClockPlace) |
|
@@ -181,7 +181,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement |
|
|
var attendancerulEntity = this.BaseRepository("CollegeMIS").FindEntity<ADR_RestrictionEntity>(m => m.REnable == true); |
|
|
var attendancerulEntity = this.BaseRepository("CollegeMIS").FindEntity<ADR_RestrictionEntity>(m => m.REnable == true); |
|
|
if (attendancerulEntity != null) |
|
|
if (attendancerulEntity != null) |
|
|
{ |
|
|
{ |
|
|
var userinfo = LoginUserInfo.Get(); //new UserInfo { account = "System", realName = "超级管理员" }; // |
|
|
|
|
|
|
|
|
var userinfo = LoginUserInfo.Get(); |
|
|
//员工账号 |
|
|
//员工账号 |
|
|
string EmpNo = userinfo.account; |
|
|
string EmpNo = userinfo.account; |
|
|
|
|
|
|
|
@@ -206,12 +206,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement |
|
|
|
|
|
|
|
|
//设备事件时间(在这里,=当前时间) |
|
|
//设备事件时间(在这里,=当前时间) |
|
|
DateTime devicetime = Convert.ToDateTime(strTime); |
|
|
DateTime devicetime = Convert.ToDateTime(strTime); |
|
|
//掉线补传数据时间判断 |
|
|
|
|
|
//设备时间小于当前时间,判断为补传历史时间数据 |
|
|
|
|
|
//if (devicetime.Date != DateTime.Now.Date) |
|
|
|
|
|
//{ |
|
|
|
|
|
// datenow = devicetime.ToString("yyyy-MM-dd"); |
|
|
|
|
|
//} |
|
|
|
|
|
|
|
|
|
|
|
//上班时间 |
|
|
//上班时间 |
|
|
DateTime workDateTime = Convert.ToDateTime(datenow + " " + attendancerulEntity.WorkTime); |
|
|
DateTime workDateTime = Convert.ToDateTime(datenow + " " + attendancerulEntity.WorkTime); |
|
|
//上班考勤时间段 |
|
|
//上班考勤时间段 |
|
|