From 4e8592ac30a051931580a84666473994c2439d19 Mon Sep 17 00:00:00 2001 From: zzj <31836194@qq.com> Date: Fri, 12 Jan 2024 12:10:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8B=A4=E6=89=93=E5=8D=A1=E5=92=8CPC?= =?UTF-8?q?=E8=A1=A5=E5=8D=A1=E4=BA=BA=E8=84=B8=E8=AF=86=E5=88=AB=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E5=A4=84=E7=90=86=E4=B8=BA=E9=BB=98=E8=AE=A4=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/AttendanceApi.cs | 35 +++++++++++-------- .../ADR_Record/ADR_RecordService.cs | 9 ++--- .../ADR_Restriction/ADR_RestrictionService.cs | 23 ++++-------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs index 5dc903813..b12e371f9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/AttendanceApi.cs @@ -47,7 +47,7 @@ namespace Learun.Application.WebApi.Modules public Response GetTeacherRecord(dynamic _) { ReqPageParam parameter = this.GetReqData(); - var res=adr_RecordBLL.GetList(parameter.queryJson); + var res = adr_RecordBLL.GetList(parameter.queryJson); var jsondata = new { @@ -113,19 +113,26 @@ namespace Learun.Application.WebApi.Modules var userinfo = LoginUserInfo.Get(); //员工账号 string EmpNo = userinfo.account; - - //根据用户编号获取用户头像 - var einfo = empInfoIBLL.GetEmpInfoEntityByEmpNo(EmpNo); - if (einfo == null) + string result = "0"; + if (parameter.AIsOut) { - return Fail("用户数据错误！"); + result = "1"; } - string userimg = einfo.Photo; - string imgid = parameter.Img; + else + { + //根据用户编号获取用户头像 + var einfo = empInfoIBLL.GetEmpInfoEntityByEmpNo(EmpNo); + if (einfo == null) + { + return Fail("用户数据错误！"); + } + string userimg = einfo.Photo; + string imgid = parameter.Img; - var url = Config.GetValue("FaceCheckApi"); - - string result = Util.HttpMethods.HttpGet($"{url}{userimg}/{imgid}"); + var url = Config.GetValue("FaceCheckApi"); + + result = Util.HttpMethods.HttpGet($"{url}{userimg}/{imgid}"); + } if (result == "1") { adr_RestrictionBLL.ClockIn(parameter.ALon, parameter.ALat, parameter.AIsOut, parameter.ARemark, parameter.ADPhoto, parameter.ClockPlace, parameter.Img); @@ -137,7 +144,7 @@ namespace Learun.Application.WebApi.Modules return Fail("打卡照片异常，请重新拍照！"); } - + } /// /// 学生打卡 @@ -148,7 +155,7 @@ namespace Learun.Application.WebApi.Modules { Attendance parameter = this.GetReqData(); - adr_RestrictionBLL.ClockInStudent(parameter.ALon, parameter.ALat, parameter.AIsOut, parameter.ARemark, parameter.ADPhoto, parameter.ClockPlace,parameter.LessonSortNo,parameter.ALTId,parameter.ALTOEId); + adr_RestrictionBLL.ClockInStudent(parameter.ALon, parameter.ALat, parameter.AIsOut, parameter.ARemark, parameter.ADPhoto, parameter.ClockPlace, parameter.LessonSortNo, parameter.ALTId, parameter.ALTOEId); return Success("打卡成功"); } @@ -222,7 +229,7 @@ namespace Learun.Application.WebApi.Modules return Fail("打卡照片异常，请重新拍照！"); } - + } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs index 67eee6e6d..e98979954 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/ADR_Record/ADR_RecordService.cs @@ -529,6 +529,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { + entity.IsFit = true; if (!string.IsNullOrEmpty(entity.ADPhoto) && string.IsNullOrEmpty(entity.Img)) { entity.Img = entity.ADPhoto; @@ -543,10 +544,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } else { - if (entity.ClockStatus == "4" || entity.ClockStatus == "5" || entity.AIsOut) - { - entity.IsFit = true; - } + //if (entity.ClockStatus == "4" || entity.ClockStatus == "5" || entity.AIsOut) + //{ + // entity.IsFit = true; + //} entity.Create(); this.BaseRepository("CollegeMIS").Insert(entity); } 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 4a68e3eb5..753ed76d9 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 @@ -399,10 +399,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement adrRecordEntity.ADPhoto = ADPhoto; adrRecordEntity.ClockPlace = ClockPlace; adrRecordEntity.Img = img; - if(AIsOut) - { - adrRecordEntity.IsFit = true; - } + adrRecordEntity.IsFit = true; ////记录日志 //ADR_DeviceLogEntity adrDeviceLogEntity = new ADR_DeviceLogEntity(); //adrDeviceLogEntity.Create(); @@ -533,10 +530,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement adrRecordEntity.ADPhoto = ADPhoto; adrRecordEntity.ClockPlace = ClockPlace; adrRecordEntity.Img = img; - if(AIsOut) - { - adrRecordEntity.IsFit = true; - } + adrRecordEntity.IsFit = true; ////记录日志 //ADR_DeviceLogEntity adrDeviceLogEntity = new ADR_DeviceLogEntity(); //adrDeviceLogEntity.Create(); @@ -638,10 +632,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement adrRecordEntity.ADPhoto = ADPhoto; adrRecordEntity.ClockPlace = ClockPlace; adrRecordEntity.Img = img; - if(AIsOut) - { - adrRecordEntity.IsFit = true; - } + adrRecordEntity.IsFit = true; ////记录日志 //ADR_DeviceLogEntity adrDeviceLogEntity = new ADR_DeviceLogEntity(); //adrDeviceLogEntity.Create(); @@ -997,10 +988,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement adrRecordEntity.ADPhoto = ADPhoto; adrRecordEntity.ClockPlace = ClockPlace; adrRecordEntity.Img = img; - if(AIsOut) - { - adrRecordEntity.IsFit = true; - } + adrRecordEntity.IsFit = true; + //adrRecordEntity.ADPhoto = str; ////记录日志 //ADR_DeviceLogEntity adrDeviceLogEntitylateorleave = new ADR_DeviceLogEntity(); @@ -2131,6 +2120,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement teach_AttendanceEntity.AIsOut = entity.AIsOut; teach_AttendanceEntity.ARemark = entity.ARemark; teach_AttendanceEntity.Img = entity.Img; + teach_AttendanceEntity.IsFit = entity.IsFit; db.Insert(teach_AttendanceEntity); } //下课 @@ -2154,6 +2144,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement teach_AttendanceEntity.AIsOut = entity.AIsOut; teach_AttendanceEntity.ARemark = entity.ARemark; teach_AttendanceEntity.Img = entity.Img; + teach_AttendanceEntity.IsFit = entity.IsFit; db.Insert(teach_AttendanceEntity); } }