Browse Source

【修改】判断学生打卡接口:对当天必修和选修课增加按节次排序;

黑艺新账号
dyy 1 year ago
parent
commit
dabd0e8d72
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs

+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ADR_Restriction/ADR_RestrictionService.cs View File

@@ -1464,7 +1464,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
//当天课程 //当天课程
//必修课 //必修课
var lessons = BaseRepository("CollegeMIS").FindList<ArrangeLessonTermEntity>(m => m.AcademicYearNo == say.AcademicYearShort && m.Semester == say.Semester 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) foreach (var arrangeLessonTermEntity in lessons)
{ {
@@ -1534,7 +1534,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
left join ArrangeLessonTermOfElective a on ccc.olpoeid = a.PaiKeId left join ArrangeLessonTermOfElective a on ccc.olpoeid = a.PaiKeId
where a.AcademicYearNo = '{say.AcademicYearShort}' and a.Semester = '{say.Semester}' where a.AcademicYearNo = '{say.AcademicYearShort}' and a.Semester = '{say.Semester}'
and a.LessonDate = '{datenow}' 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) foreach (var arrangeLessonTermEntity in lessonelective)
{ {


Loading…
Cancel
Save