Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs

@@ -327,8 +327,9 @@ where l.EPLId='{EPLId}'
                 //排考记录表
                 var examPlan = db.FindEntity<Exam_ExamPlanEntity>(EPId);
                 //查询当前考试记录所有考试课程
-                var lessonList = db.FindList<Exam_ExamPlanLessonEntity>($@"select a.*,b.LessonTypeId,b.MajorNo as TeachMajorNo FROM [dbo].[Exam_ExamPlanLesson] a
-left join [dbo].[Exam_ExamLesson] b on a.ELId=b.ELId
+                var lessonList = db.FindList<Exam_ExamPlanLessonEntity>($@"select a.*,b.MajorNo as TeachMajorNo FROM [dbo].[Exam_ExamPlanLesson] a
+left join [dbo].[Exam_ExamPlan] c on c.epid=a.epid 
+left join [dbo].[Exam_ExamLesson] b on a.lessonno=b.lessonno and b.AcademicYearNo=c.AcademicYearNo and b.Semester=c.Semester  and b.Grade=a.Grade 
 where a.EPId='{EPId}'");
                 foreach (var lesson in lessonList)
                 {