From 979c0f383fe1f1a0511913c9e4336e91048e2bdd Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 14 Aug 2023 16:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=88=A4=E6=96=AD=E6=94=B9?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ADR_Restriction/ADR_RestrictionService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 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 8f14c10fe..972cfdb77 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 @@ -1443,7 +1443,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var stuInfoBasic = BaseRepository("CollegeMIS").FindEntity(m => m.StuNo == userinfo.account); //当前服务器日期 var datenow = DateTime.Now.ToString("yyyy-MM-dd"); - + DateTime datenowdatetime = Convert.ToDateTime(datenow); var datetimenow = DateTime.Now; //首先获取考勤规则 ADR_RestrictionEntity attendancerulEntity = null; @@ -1468,8 +1468,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement var say=Common.GetSemesterAndYear(); //当天课程 //必修课 - var lessons = BaseRepository("CollegeMIS").FindList(m => m.AcademicYearNo == say.AcademicYearShort&&m.Semester==say.Semester - &&m.DeptNo==stuInfoBasic.DeptNo&&m.MajorNo==stuInfoBasic.MajorNo&&m.TeachClassNo.Contains(stuInfoBasic.ClassNo)&&m.LessonDate.Value.ToString("yyyy-MM-dd") == datenow); + var lessons = BaseRepository("CollegeMIS").FindList(m => m.AcademicYearNo == say.AcademicYearShort && m.Semester == say.Semester + && m.DeptNo == stuInfoBasic.DeptNo && m.MajorNo == stuInfoBasic.MajorNo && m.TeachClassNo.Contains(stuInfoBasic.ClassNo) && m.LessonDate.Value== datenowdatetime); //当前打卡课程判断 foreach (var arrangeLessonTermEntity in lessons) {