安排考试--只显示已启用的

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

@@ -275,7 +275,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
 
             exam_ExamPlanLessonIBLL.Check(keyValue, ELCheckMark);
-            return Success("审核成功！");
+            return Success("操作成功！");
         }
         /// <summary>
         /// 保存实体数据（新增、修改）

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

@@ -51,7 +51,7 @@
                         @*<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>*@
                     </div>
                     <div class=" btn-group btn-group-sm">
-                        <a id="lr_importBy" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;一键生成考试信息</a>
+                        <a id="lr_importBy" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;一键生成考生信息</a>
                         <a id="lr_clearBy" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;按条件清空学生考试信息</a>
                     </div>
                 </div>

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

@@ -131,7 +131,7 @@ var bootstrap = function ($, learun) {
             $('#lr_importBy').on('click', function () {
                 learun.layerForm({
                     id: 'form_import',
-                    title: '生成考试信息',
+                    title: '生成考生信息',
                     url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamStudent/FormImport',
                     width: 500,
                     height: 300,

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanLesson/Exam_ExamPlanLessonService.cs

@@ -183,7 +183,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     //必修
                     string sql = $@"insert into Exam_ExamPlanLesson(EPLId,EPId,LessonName,LessonNo)
-select NEWID(),'{EPId}',LessonName+'('+grade+')',LessonNo+'('+grade+')' from Exam_ExamLesson where AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan.Semester}'
+select NEWID(),'{EPId}',LessonName+'('+grade+')',LessonNo+'('+grade+')' from Exam_ExamLesson where ELEnabled=1 and AcademicYearNo='{exam_ExamPlan.AcademicYearNo}' and Semester='{exam_ExamPlan.Semester}'
  and LessonNo not in (select LessonNo+'('+grade+')' from Exam_ExamPlanLesson where EPId='{EPId}')
  group by LessonNo,grade,LessonName";
                     this.BaseRepository("CollegeMIS").ExecuteBySql(sql);

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

@@ -93,7 +93,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("SELECT ");
                 strSql.Append(@" ClassNo,count(1) as StuNum,AcademicYearNo,Semester,ESType ");
                 strSql.Append("  FROM Exam_ExamStudent t ");
-                strSql.Append("  WHERE 1=1 ");
+                strSql.Append("  WHERE ESEnabled=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });