diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index cf4eb5d6c..d9b24e91e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs @@ -724,17 +724,16 @@ WHERE (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest if (entity.SyncType == "1") { var LessonList = BaseRepository("paikeDbString").FindList( - @"SELECT a.week AS 'week', a.section AS 'section',a.timetext AS 'timetext',c.name AS 'classname',c.number AS 'classnumber', - r.name AS 'roomname',r.number AS 'ClassroomNo',t.name AS 'teachername',t.number AS 'teacherNumber', cu.name AS 'curriculunName', - cu.number AS 'curriculunNumber', s.year AS 'year', s.number AS 'semester' - FROM tb_paike a - LEFT JOIN tb_clazz c ON c.id= a.`clazzid` - LEFT JOIN tb_classroom r ON r.id =a.`classroomid` - 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 c.number IS NOT NULL AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'"); - + @"SELECT a.WEEK AS 'week', a.section AS 'sectoin', a.timetext AS 'date', c.NAME AS 'classname', c.number AS 'classnumber', + r.NAME AS 'roomname', r.number AS 'roomnunber', GROUP_CONCAT(t.name) AS 'teachername', GROUP_CONCAT(t.number) AS 'teachernumber', + cu.NAME AS 'currname', cu.number AS 'currnumber', s.YEAR AS 'semesteryear', s.number AS 'semesternumber' + FROM tb_paike a + LEFT JOIN tb_clazz c ON c.id = a.`clazzid` + LEFT JOIN tb_classroom r ON r.id = a.`classroomid` + LEFT JOIN tb_teacher t ON FIND_IN_SET(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 + "' group by a.id"); if (LessonList.Count() > 0) { var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync()).ToList();