同步必修排课方法内去掉选修课的数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -684,7 +684,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                                             LEFT JOIN tb_teacher t ON t.id =a.`teacherid`
                                             LEFT JOIN tb_curriculum cu ON cu.id=a.`curriculunid`
                                             LEFT JOIN tb_semester s ON s.id=a.`semester`
-                    WHERE 1=1  AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'");
+                    WHERE 1=1 AND c.number IS NOT NULL  AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'");
 
                     if (LessonList.Count() > 0)
                     {
@@ -758,7 +758,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 LEFT JOIN tb_curriculum  curriculum ON curriculum.id = a.curriculum
                 LEFT JOIN tb_classroom  room ON room.id = a.classroom
                 LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher
-                WHERE  semester.year = '" + entity.AcademicYearNo + "' AND  semester.number = '" + entity.Semester + "'");
+                WHERE  a.type='1' and semester.year = '" + entity.AcademicYearNo + "' AND  semester.number = '" + entity.Semester + "'");
                     var TeachClassData = (await BaseRepository("CollegeMIS").FindListAsync<TeachClassEntity>(@"SELECT   *
                             FROM      TeachClass
                             WHERE   (AcademicYearNo = '" + entity.AcademicYearNo + "') and semester='" + entity.Semester + "' and F_SchoolId='" + entity.F_SchoolId + "'  ")).ToList();
@@ -847,7 +847,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                                 LEFT JOIN tb_course cour ON cour.id= p.`course`
                                 LEFT JOIN tb_curriculum curr ON curr.id=cour.`course`
                                 WHERE  s.year = '" + entity.AcademicYearNo + "' AND  s.number = '" + entity.Semester
-                    + "'   AND sc.sid = '" + entity.F_SchoolId + "' ORDER BY p.`major` ");
+                    + "'   AND sc.sid = '" + entity.F_SchoolId + "' AND curr.`ification` ='1' ORDER BY p.`major` ");
 
                 var majorData = (await BaseRepository("CollegeMIS").FindListAsync<CdMajorEntity>()).ToList();
                 var lessonData = (await BaseRepository("CollegeMIS").FindListAsync<LessonInfoEntity>()).ToList();