Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.cshtml

@@ -26,6 +26,10 @@
                                     <div class="lr-form-item-title">课程名称</div>
                                     <input id="LessonName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否启用</div>
+                                    <div id="ELEnabled"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamLesson/Index.js

@@ -30,6 +30,15 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $.get('/Home/GetYearAndSemesteResult', function (ref) {
+                if (ref.code == "200") {
+                    $('#AcademicYearNo').lrselectSet(ref.data.Item1);
+                    $('#Semester').lrselectSet(ref.data.Item3);
+                }
+            }.bind(this), "json");
+            $('#ELEnabled').lrDataItemSelect({
+                code: "YesOrNoBit"
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.cshtml

@@ -26,6 +26,10 @@
                                     <div class="lr-form-item-title">考场名称</div>
                                     <input id="ClassroomName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否启用</div>
+                                    <div id="EREnabled"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js

@@ -30,6 +30,15 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $.get('/Home/GetYearAndSemesteResult', function (ref) {
+                if (ref.code == "200") {
+                    $('#AcademicYearNo').lrselectSet(ref.data.Item1);
+                    $('#Semester').lrselectSet(ref.data.Item3);
+                }
+            }.bind(this), "json");
+            $('#EREnabled').lrDataItemSelect({
+                code: "YesOrNoBit"
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml

@@ -26,18 +26,22 @@
                                     <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学生学号</div>
                                     <input id="StuNo" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学生名称</div>
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">考试类型</div>
                                     <div id="ESType"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否启用</div>
+                                    <div id="ESEnabled"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js

@@ -30,6 +30,15 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $.get('/Home/GetYearAndSemesteResult', function (ref) {
+                if (ref.code == "200") {
+                    $('#AcademicYearNo').lrselectSet(ref.data.Item1);
+                    $('#Semester').lrselectSet(ref.data.Item3);
+                }
+            }.bind(this), "json");
+            $('#ESEnabled').lrDataItemSelect({
+                code: "YesOrNoBit"
+            });
             $('#ESType').lrDataItemSelect({ code: 'StudentType' });
             // 刷新
             $('#lr_refresh').on('click', function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.cshtml

@@ -10,22 +10,26 @@
                     <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-6 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="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="Semester"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">教师编号</div>
                                     <input id="EmpNo" type="text" class="form-control" />
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">教师姓名</div>
                                     <input id="EmpName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否启用</div>
+                                    <div id="ITEnabled"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_InvigilateTeacher/Index.js

@@ -32,6 +32,15 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
+            $.get('/Home/GetYearAndSemesteResult', function (ref) {
+                if (ref.code == "200") {
+                    $('#AcademicYearNo').lrselectSet(ref.data.Item1);
+                    $('#Semester').lrselectSet(ref.data.Item3);
+                }
+            }.bind(this), "json");
+            $('#ITEnabled').lrDataItemSelect({
+                code: "YesOrNoBit"
+            });
             // 刷新
             $('#lr_refresh').on('click',
                 function () {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs

@@ -49,6 +49,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                     strSql.Append(" AND t.Semester = @Semester ");
                 }
+                if (!queryParam["ELEnabled"].IsEmpty())
+                {
+                    dp.Add("ELEnabled", queryParam["ELEnabled"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ELEnabled = @ELEnabled ");
+                }
                 if (!queryParam["LessonNo"].IsEmpty())
                 {
                     dp.Add("LessonNo", "%" + queryParam["LessonNo"].ToString() + "%", DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs

@@ -47,6 +47,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                     strSql.Append(" AND t.Semester = @Semester ");
                 }
+                if (!queryParam["EREnabled"].IsEmpty())
+                {
+                    dp.Add("EREnabled", queryParam["EREnabled"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EREnabled = @EREnabled ");
+                }
                 if (!queryParam["ClassroomNo"].IsEmpty())
                 {
                     dp.Add("ClassroomNo", "%" + queryParam["ClassroomNo"].ToString() + "%", DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs

@@ -49,6 +49,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                     strSql.Append(" AND t.Semester = @Semester ");
                 }
+                if (!queryParam["ESEnabled"].IsEmpty())
+                {
+                    dp.Add("ESEnabled", queryParam["ESEnabled"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ESEnabled = @ESEnabled ");
+                }
                 if (!queryParam["ClassNo"].IsEmpty())
                 {
                     dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_InvigilateTeacher/Exam_InvigilateTeacherService.cs

@@ -50,6 +50,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                     strSql.Append(" AND t.Semester = @Semester ");
                 }
+                if (!queryParam["ITEnabled"].IsEmpty())
+                {
+                    dp.Add("ITEnabled", queryParam["ITEnabled"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ITEnabled = @ITEnabled ");
+                }
                 if (!queryParam["EmpNo"].IsEmpty())
                 {
                     dp.Add("EmpNo", "%" + queryParam["EmpNo"].ToString() + "%", DbType.String);
@@ -361,7 +366,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
            ,[EmpNo]
            ,[ITOrder]
            ,[ITEnabled])
-select newid(),'{AcademicYearNo}','{Semester}',empname,empno,0,1 from empinfo where checkmark=1
+select newid(),'{AcademicYearNo}','{Semester}',empname,empno,0,1 from empinfo where checkmark=1 and IsHasLesson=1 and IsInActiveStatus=1
  and empno not in (select empno from Exam_InvigilateTeacher where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}')
 ";
                 return this.BaseRepository("CollegeMIS").ExecuteBySql(sql);