Merge branch '临城职教中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 临城职教中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js

@@ -79,13 +79,16 @@ var bootstrap = function ($, learun) {
                                         if (i > 0) {
                                             html += '<hr>';
                                         }
-                                        html += '<div>' +
+                                        html += '<div>课程：' +
                                             item.curriculum +
                                             '</div>' +
-                                            '<div>' +
+                                            '<div>教师：' +
                                             item.teacher +
                                             '</div>' +
-                                            '<div>' +
+                                            '<div>班级：' +
+                                            item.className +
+                                            '</div>' +
+                                            '<div>教室：' +
                                             item.classRoom +
                                             '</div>';
                                         //html += '<div>课程：' +

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js

@@ -80,13 +80,16 @@ var bootstrap = function ($, learun) {
                                         if (i > 0) {
                                             html += '<hr>';
                                         }
-                                        html += '<div>' +
+                                        html += '<div>课程：' +
                                             item.curriculum +
                                             '</div>' +
-                                            '<div>' +
+                                            '<div>教师：' +
                                             item.teacher +
                                             '</div>' +
-                                            '<div>' +
+                                            '<div>班级：' +
+                                            item.className +
+                                            '</div>' +
+                                            '<div>教室：' +
                                             item.classRoom +
                                             '</div>';
                                         //html += '<div>课程：' +

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermTeach.js

@@ -79,13 +79,16 @@ var bootstrap = function ($, learun) {
                                         if (i > 0) {
                                             html += '<hr>';
                                         }
-                                        html += '<div>' +
+                                        html += '<div>课程：' +
                                             item.curriculum +
                                             '</div>' +
-                                            '<div>' +
+                                            '<div>教师：' +
                                             item.teacher +
                                             '</div>' +
-                                            '<div>' +
+                                            '<div>班级：' +
+                                            item.className +
+                                            '</div>' +
+                                            '<div>教室：' +
                                             item.classRoom +
                                             '</div>';
                                         //html += '<div>课程：' +

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs

@@ -221,7 +221,7 @@ namespace Learun.Application.WebApi.Modules
                 var Stulist = stuInfoBasicIBLL.GetAllList().Where(x => x.StuNo == param.Account).FirstOrDefault();
                 if (Stulist != null)
                 {
-                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, param.ClassNo, "", "");
+                    Data = arrangeLessonTermIBLL.GetTimeTableInEducation(param.StartDate, param.EndDate, Stulist.ClassNo, "", "");
                 }
             }
             else if (param.Description == "教师")