diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Form.cshtml
index 46d0bdd27..836946cfa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Form.cshtml	
@@ -19,6 +19,10 @@
         <div class="lr-form-item-title">学生姓名<font face="宋体">*</font></div>
         <input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Exam_ExamStudent">
+        <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Exam_ExamStudent">
         <div class="lr-form-item-title">考试类型<font face="宋体">*</font></div>
         <div id="ESType" isvalid="yes" checkexpession="NotNull"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Form.js
index ceb26a522..9cafc568f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Form.js	
@@ -31,6 +31,7 @@ var bootstrap = function ($, learun) {
                 text: 'text'
             });
             $('#ESType').lrDataItemSelect({ code: 'StudentType' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#ESEnabled').lrRadioCheckbox({
                 type: 'radio',
                 code: 'YesOrNoBit',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml
index 116cf9d20..d95c20fac 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.cshtml	
@@ -18,6 +18,10 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="Semester"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">学生学号</div>
                                     <input id="StuNo" type="text" class="form-control" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js
index 74f82f299..14e0e5b59 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamStudent/Index.js	
@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
+            }, 245, 400);
             $('#AcademicYearNo').lrselect({
                 placeholder: "学年",
                 allowSearch: true,
@@ -35,6 +35,7 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             // 新增
             $('#lr_add').on('click', function () {
                 learun.layerForm({
@@ -157,7 +158,20 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
                     { label: "学期", name: "Semester", width: 100, align: "left" },
-                    { label: "学生学号", name: "StuNo", width: 100, align: "left" },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学生编号", name: "StuNo", width: 100, align: "left" },
                     { label: "学生姓名", name: "StuName", width: 100, align: "left" },
                     {
                         label: "考试类型", name: "ESType", width: 100, align: "left",
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentEntity.cs
index 316d333ea..fad00673c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentEntity.cs	
@@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("ESID")]
         public string ESId { get; set; }
         /// <summary>
+        /// 班级
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
         /// 学年
         /// </summary>
         [Column("ACADEMICYEARNO")]
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs
index e21ce7800..04464db5c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs	
@@ -33,16 +33,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ESId,
-                t.AcademicYearNo,
-                t.Semester,
-                t.StuName,
-                t.StuNo,
-                t.ESType,
-                t.ESOrder,
-                t.ESEnabled
-                ");
+                strSql.Append(@" * ");
                 strSql.Append("  FROM Exam_ExamStudent t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -58,6 +49,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                     strSql.Append(" AND t.Semester = @Semester ");
                 }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo", queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
                 if (!queryParam["StuNo"].IsEmpty())
                 {
                     dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
@@ -290,6 +286,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         var stuList = new Exam_ExamStudentEntity
                         {
                             ESId = Guid.NewGuid().ToString(),
+                            ClassNo = item.ClassNo,
                             AcademicYearNo = AcademicYearNo,
                             Semester = Convert.ToInt32(Semester),
                             StuNo = item.StuNo,
@@ -312,6 +309,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         var stuList = new Exam_ExamStudentEntity
                         {
                             ESId = Guid.NewGuid().ToString(),
+                            ClassNo = item.ClassNo,
                             AcademicYearNo = AcademicYearNo,
                             Semester = Convert.ToInt32(Semester),
                             StuNo = item.StuNo,
@@ -334,6 +332,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         var stuList = new Exam_ExamStudentEntity
                         {
                             ESId = Guid.NewGuid().ToString(),
+                            ClassNo = item.ClassNo,
                             AcademicYearNo = AcademicYearNo,
                             Semester = Convert.ToInt32(Semester),
                             StuNo = item.StuNo,