|
|
@@ -1464,7 +1464,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement |
|
|
|
//当天课程 |
|
|
|
//必修课 |
|
|
|
var lessons = BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(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); |
|
|
|
&& m.DeptNo == stuInfoBasic.DeptNo && m.MajorNo == stuInfoBasic.MajorNo && m.TeachClassNo.Contains(stuInfoBasic.ClassNo) && m.LessonDate.Value == datenowdatetime).OrderBy(x => x.LessonTime); |
|
|
|
//当前打卡课程判断 |
|
|
|
foreach (var arrangeLessonTermEntity in lessons) |
|
|
|
{ |
|
|
@@ -1534,7 +1534,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement |
|
|
|
left join ArrangeLessonTermOfElective a on ccc.olpoeid = a.PaiKeId |
|
|
|
where a.AcademicYearNo = '{say.AcademicYearShort}' and a.Semester = '{say.Semester}' |
|
|
|
and a.LessonDate = '{datenow}' |
|
|
|
and a.CheckMark = '1' "); |
|
|
|
and a.CheckMark = '1' ").OrderBy(x => Convert.ToInt32(x.LessonSection.Substring(1))); |
|
|
|
//当前打卡课程判断 |
|
|
|
foreach (var arrangeLessonTermEntity in lessonelective) |
|
|
|
{ |
|
|
|