|
|
@@ -1090,7 +1090,7 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest |
|
|
|
LEFT JOIN tb_teacher teacher ON teacher.id = a.teacher |
|
|
|
WHERE semester.year = '" + entity.AcademicYearNo |
|
|
|
+ "' AND semester.number = '" |
|
|
|
+ entity.Semester + "' and a.type='1' "); |
|
|
|
+ entity.Semester + "' and a.type='1' and teacher.number is not null "); |
|
|
|
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(); |
|
|
@@ -1179,7 +1179,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 curr.`ification` ='1' ORDER BY p.`major` "); |
|
|
|
+ "' AND curr.`ification` ='1' and tt.EmpNo is not null ORDER BY p.`major` "); |
|
|
|
var majorData = (await BaseRepository("CollegeMIS").FindListAsync<CdMajorEntity>()).ToList(); |
|
|
|
var lessonData = (await BaseRepository("CollegeMIS").FindListAsync<LessonInfoEntity>()).ToList(); |
|
|
|
if (TeachList.Count() > 0) |
|
|
|