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/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -679,15 +679,14 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                     var LessonList = BaseRepository("paikeDbString").FindList<paikeList>(
                                             @"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', sc.name AS 'schoolname', sc.sid AS 'schoolno'
+                                            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`
-                                            LEFT JOIN tb_school sc ON sc.`id`= a.`school`
-                    WHERE 1=1  AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'AND sc.sid = '" + entity.F_SchoolId + " '");
+                    WHERE 1=1  AND s.year = '" + entity.AcademicYearNo + "' AND s.number ='" + entity.Semester + "'");
                     if (LessonList.Count() > 0)
                     {
                         var oldArrangeLessonTermList = (await BaseRepository("CollegeMIS").FindListAsync<ArrangeLessonTermEntity>()).ToList();
@@ -706,14 +705,14 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                                 MajorNo = classinfo?.MajorNo,
                                 LessonNo = item.curriculunNumber,
                                 LessonName = item.curriculunName,
-                                TeachClassNo = item.curriculunName + classinfo?.ClassNo,
+                                TeachClassNo =classinfo?.ClassNo,
                                 EmpNo = item.teacherNumber,
                                 EmpName = item.teachername,
                                 LessonSortNo = lessonData.FirstOrDefault(m => m.LessonNo == item.curriculunNumber)?.LessonSortNo,
                                 ClassroomNo = classroomData.FirstOrDefault(m => m.ClassroomNo == item.ClassroomNo)?.ClassroomNo,
-                                LessonTime = item.week + item.section,
+                                LessonTime = item.week+"-"+item.section,
                                 CheckMark = "1",
-                                F_SchoolId = item.schoolno
+                                F_SchoolId =entity.F_SchoolId
                             };
                             if (oldArrangeLessonTermList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester
                                                                   && m.LessonNo == insertData.LessonNo && m.LessonDate == insertData.LessonDate