From e5f602204f5dc632419b5e26221da8ca03763f42 Mon Sep 17 00:00:00 2001 From: liangkun Date: Sun, 20 Aug 2023 19:04:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9F=E5=88=B0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADR_Restriction/ADR_RestrictionService.cs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs index d7c4ff5e4..01090a5e6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs @@ -169,7 +169,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } /// - /// 考勤打卡 + /// 考勤打卡教师 /// /// 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(m => m.REnable == true); if (attendancerulEntity != null) { - var userinfo = LoginUserInfo.Get(); //new UserInfo { account = "System", realName = "超级管理员" }; // + var userinfo = LoginUserInfo.Get(); //员工账号 string EmpNo = userinfo.account; @@ -206,12 +206,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement //设备事件时间（在这里，=当前时间） DateTime devicetime = Convert.ToDateTime(strTime); - //掉线补传数据时间判断 - //设备时间小于当前时间，判断为补传历史时间数据 - //if (devicetime.Date != DateTime.Now.Date) - //{ - // datenow = devicetime.ToString("yyyy-MM-dd"); - //} + //上班时间 DateTime workDateTime = Convert.ToDateTime(datenow + " " + attendancerulEntity.WorkTime); //上班考勤时间段