Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TimeTable/IndexInEducation.js

@@ -12,17 +12,7 @@ var bootstrap = function ($, learun) {
                 function (data) {
                     // 数据处理
                     var html = '';
-                    var allList = data.weekList?data.weekList[0].list:[];
-                    var weekLists = [];
-                    for (var i = 1; i < 11; i++) {
-                        (function (arg) {
-                            let obj = {
-                                time: i,
-                                list: allList.filter(e => e.lessonTime == i),
-                            }
-                            weekLists.push(obj)
-                        })(i); //调用时参数  
-                    }
+                    var weekLists = data.weekList;
                     for (var i = 1; i < 11; i++) {
                         (function (arg) {
                             var args = arg - 1;

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

@@ -724,7 +724,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                 if (entity.SyncType == "1")
                 {
                     var LessonList = BaseRepository("paikeDbString").FindList<paikeList>(
-                    @"SELECT a.WEEK AS 'week', a.section AS 'sectoin', a.timetext AS 'timetext', c.NAME AS 'classname', c.number AS 'classnumber',
+                    @"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', GROUP_CONCAT(t.name)  AS 'teachername', GROUP_CONCAT(t.number) AS 'teacherNumber', 
                                 cu.NAME AS 'curriculunName', cu.number AS 'curriculunNumber', s.YEAR AS 'year', s.number AS 'semester'  
                                 FROM tb_paike a 
@@ -759,10 +759,12 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                                     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 = entity.F_SchoolId
                                 };
+                                Util.Log.LogHelper.Info($"item week {item.week} section {item.section} , insertdata {insertData.LessonTime}");
                                 if (oldArrangeLessonTermList.Count(m => m.AcademicYearNo == insertData.AcademicYearNo && m.Semester == insertData.Semester
                                                                       && m.LessonNo == insertData.LessonNo && m.LessonDate.Value.Date == insertData.LessonDate.Value.Date
                                                                       && m.DeptNo == insertData.DeptNo && m.MajorNo == insertData.MajorNo