Merge branch '西昌分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanLessonController.cs

@@ -77,7 +77,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         /// <param name="pagination"></param>
         /// <param name="queryJson"></param>
         /// <returns></returns>
-            [HttpGet]
+        [HttpGet]
         [AjaxOnly]
         public ActionResult GetClassInfoPageList(string pagination, string queryJson)
         {
@@ -257,7 +257,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             if (ELCheckMark == 1)
             {
                 var entity = exam_ExamPlanLessonIBLL.GetExam_ExamPlanLessonEntity(keyValue);
-                if (entity.ExamDate == null || entity.ExamTimeStart == null || entity.ExamTimeEnd == null)
+                if (entity.ExamDate == null || entity.ExamTime == null)
                 {
                     return Fail("请先设置考试时间！");
                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormTeacher.cshtml

@@ -10,14 +10,14 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
+                                @*<div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
                                     <div id="AcademicYearNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="Semester"></div>
-                                </div>
+                                </div>*@
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">教师编号</div>
                                     <input id="EmpNo" type="text" class="form-control" />