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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.cshtml

@@ -15,28 +15,32 @@
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
         <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
+        <div class="lr-form-item-title">考试类型<font face="宋体">*</font></div>
+        <div id="ExamType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
+        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
+        <div id="Grade" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
         <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
         <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
-        <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
-        <div id="Grade" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
     <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">课程<font face="宋体">*</font></div>
         <div id="LessonNo" isvalid="yes" checkexpession="NotNull"></div>
         <input id="LessonName" type="hidden" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">课程细类码</div>
         <div id="LessonSortDetailNo"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ClassPlan" style="display: none; ">
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan" style="display: none; ">
         <div class="lr-form-item-title">开合课</div>
         <input id="StuSortNo" type="text" class="form-control" />
     </div>
@@ -44,11 +48,15 @@
         <div class="lr-form-item-title">拟开教学班数</div>
         <input id="TeachClassNum" type="text" class="form-control" isvalid="yes" checkexpession="NumOrNull" />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-3 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">人数</div>
         <input id="StuNum" type="text" class="form-control" isvalid="yes" checkexpession="NumOrNull" />
     </div>
-    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-3 lr-form-item" data-table="ClassPlan">
+        <div class="lr-form-item-title">学分</div>
+        <input id="StudyScore" type="text" class="form-control" checkexpession="NumOrNull" />
+    </div>
+    <div class="col-xs-3 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">周课时</div>
         <input id="WeekLessonHour" type="text" class="form-control" isvalid="yes" checkexpession="NumOrNull" />
     </div>
@@ -60,22 +68,18 @@
         <div class="lr-form-item-title">上机课时</div>
         <input id="PracticeHour" type="text" class="form-control" checkexpession="NumOrNull" />
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">起始周次</div>
         <input id="StartWeek" type="text" class="form-control" icheckexpession="NumOrNull" />
     </div>
-    <div class="col-xs-3 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">结束周次</div>
         <input id="EndWeek" type="text" class="form-control" checkexpession="NumOrNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
+    <div class="col-xs-4 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">负责开课院系</div>
         <div id="TeachDeptNo"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="ClassPlan">
-        <div class="lr-form-item-title">学分</div>
-        <input id="StudyScore" type="text" class="form-control" checkexpession="NumOrNull" />
-    </div>
     <div class="col-xs-12 lr-form-item" data-table="ClassPlan">
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height:100px;"></textarea>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js

@@ -74,6 +74,7 @@ var bootstrap = function ($, learun) {
             });
             $('#LessonNo').lrselect();
             $('#TeachDeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
+            $('#ExamType').lrDataItemSelect({ code: 'ExamType' });
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -210,22 +210,11 @@ var bootstrap = function ($, learun) {
                 url: top.$.rootUrl + '/EducationalAdministration/ClassPlan/GetPageList',
                 headData: [
                     { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
-                    {
-                        label: "学期", name: "Semester", width: 50, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'Semester',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
-                        }
-                    },
+                    { label: "学期", name: "Semester", width: 50, align: "left" },
                     { label: "年级", name: "Grade", width: 50, align: "left" },
-                    { label: "专业编码", name: "MajorNo", width: 120, align: "left" },
+                    { label: "专业编码", name: "MajorNo", width: 80, align: "left" },
                     {
-                        label: "专业名称", name: "MajorNo", width: 200, align: "left" ,
+                        label: "专业名称", name: "MajorNo", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
@@ -237,10 +226,10 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "课程编码", name: "LessonNo", width: 200, align: "left" },
+                    { label: "课程编码", name: "LessonNo", width: 100, align: "left" },
                     { label: "课程名称", name: "LessonName", width: 200, align: "left", },
                     {
-                        label: "课程类型", name: "LessonTypeId", width: 200, align: "left",
+                        label: "课程类型", name: "LessonTypeId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType',
@@ -253,7 +242,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "状态", name: "State", width: 100, align: "left",
+                        label: "状态", name: "State", width: 80, align: "left",
                         formatter: function (cellvalue, row) {
                             if (cellvalue == 0) {
                                 return '<span class=\"label label-warning\">未排课</span>';
@@ -262,6 +251,20 @@ var bootstrap = function ($, learun) {
                             }
                         }
                     },
+                    {
+                        label: "考试类型", name: "ExamType", width: 80, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ExamType',
+                                callback: function (_data) {
+                                    console.log(_data.text,"_data")
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学分", name: "StudyScore", width: 80, align: "left" },
                     { label: "拟开教学班数", name: "TeachClassNum", width: 100, align: "left" },
                     //{ label: "人数", name: "StuNum", width: 80, align: "left" },
                     { label: "周课时", name: "WeekLessonHour", width: 80, align: "left" },
@@ -282,7 +285,6 @@ var bootstrap = function ($, learun) {
                     //        });
                     //    }
                     //},
-                    { label: "学分", name: "StudyScore", width: 80, align: "left" },
                     { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],
                 mainId: 'ID',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/LessonInfo/Form.cshtml

@@ -37,15 +37,15 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">周理论学时<font face="宋体">*</font></div>
-        <input id="WeekStudyHour" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        <input id="WeekStudyHour" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">周实验学时<font face="宋体">*</font></div>
-        <input id="WeekPracticeHour" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        <input id="WeekPracticeHour" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">每周课时<font face="宋体">*</font></div>
-        <input id="TotalStudyHour" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+        <input id="TotalStudyHour" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="LessonInfo">
         <div class="lr-form-item-title">是否先修</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js

@@ -89,19 +89,20 @@ var bootstrap = function ($, learun) {
                 { label: "年级", name: "Grade", width: 40, align: "left" },
                 { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
                 { label: '学期', name: 'Semester', width: 40, align: "left" },
-                {
-                    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                            key: value,
-                            keyId: 'lessonno',
-                            callback: function (_data) {
-                                callback(_data['lessonname']);
-                            }
-                        });
-                    }
-                },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" }
+                //{
+                //    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+                //    formatterAsync: function (callback, value, row, op, $cell) {
+                //        learun.clientdata.getAsync('custmerData', {
+                //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                //            key: value,
+                //            keyId: 'lessonno',
+                //            callback: function (_data) {
+                //                callback(_data['lessonname']);
+                //            }
+                //        });
+                //    }
+                //},
             ];
             headDataEdit = [
                 {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js

@@ -90,19 +90,20 @@ var bootstrap = function ($, learun) {
                 { label: "年级", name: "Grade", width: 40, align: "left" },
                 { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
                 { label: '学期', name: 'Semester', width: 40, align: "left" },
-                {
-                    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                            key: value,
-                            keyId: 'lessonno',
-                            callback: function (_data) {
-                                callback(_data['lessonname']);
-                            }
-                        });
-                    }
-                },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" }
+                //{
+                //    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+                //    formatterAsync: function (callback, value, row, op, $cell) {
+                //        learun.clientdata.getAsync('custmerData', {
+                //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                //            key: value,
+                //            keyId: 'lessonno',
+                //            callback: function (_data) {
+                //                callback(_data['lessonname']);
+                //            }
+                //        });
+                //    }
+                //},
             ];
             headDataEdit = [
                 {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js

@@ -76,19 +76,20 @@ var bootstrap = function ($, learun) {
                 { label: "年级", name: "Grade", width: 100, align: "left" },
                 { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
                 { label: '学期', name: 'Semester', width: 80, align: "left" },
-                {
-                    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                            key: value,
-                            keyId: 'lessonno',
-                            callback: function (_data) {
-                                callback(_data['lessonname']);
-                            }
-                        });
-                    }
-                },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" },
+                //{
+                //    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+                //    formatterAsync: function (callback, value, row, op, $cell) {
+                //        learun.clientdata.getAsync('custmerData', {
+                //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                //            key: value,
+                //            keyId: 'lessonno',
+                //            callback: function (_data) {
+                //                callback(_data['lessonname']);
+                //            }
+                //        });
+                //    }
+                //},
                 {
                     label: '教室名称', name: 'ClassRoomNo', width: 150, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js

@@ -76,19 +76,20 @@ var bootstrap = function ($, learun) {
                 { label: "年级", name: "Grade", width: 100, align: "left" },
                 { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
                 { label: '学期', name: 'Semester', width: 80, align: "left" },
-                {
-                    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                            key: value,
-                            keyId: 'lessonno',
-                            callback: function (_data) {
-                                callback(_data['lessonname']);
-                            }
-                        });
-                    }
-                },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" },
+                //{
+                //    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+                //    formatterAsync: function (callback, value, row, op, $cell) {
+                //        learun.clientdata.getAsync('custmerData', {
+                //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                //            key: value,
+                //            keyId: 'lessonno',
+                //            callback: function (_data) {
+                //                callback(_data['lessonname']);
+                //            }
+                //        });
+                //    }
+                //},
                 {
                     label: '教室名称', name: 'ClassRoomNo', width: 150, align: "left",
                     formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/Monitor.js

@@ -81,19 +81,20 @@ var bootstrap = function ($, learun) {
                     { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
                     { label: '学期', name: 'Semester', width: 80, align: "left" },
                     { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
-                    {
-                        label: '课程名称', name: 'LessonNo', width: 200, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                                key: value,
-                                keyId: 'lessonno',
-                                callback: function (_data) {
-                                    callback(_data['lessonname']);
-                                }
-                            });
-                        }
-                    },
+                    { label: '课程名称', name: 'LessonName', width: 150, align: "left" },
+                    //{
+                    //    label: '课程名称', name: 'LessonNo', width: 200, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                    //            key: value,
+                    //            keyId: 'lessonno',
+                    //            callback: function (_data) {
+                    //                callback(_data['lessonname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "班级", name: "TeachClassNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexBKUnpass.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
  * 日  期：2021-12-16 10:14
- * 描  述：长阳迎新
+ * 描  述：补考成绩名单
  */
 var refreshGirdData;
 var bootstrap = function ($, learun) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/IndexUnpass.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
  * 创建人：超级管理员
  * 日  期：2021-12-16 10:14
- * 描  述：长阳迎新
+ * 描  述：补考名单查看
  */
 var refreshGirdData;
 var bootstrap = function ($, learun) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js

@@ -89,19 +89,20 @@ var bootstrap = function ($, learun) {
                 { label: "年级", name: "Grade", width: 40, align: "left" },
                 { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
                 { label: '学期', name: 'Semester', width: 40, align: "left" },
-                {
-                    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                            key: value,
-                            keyId: 'lessonno',
-                            callback: function (_data) {
-                                callback(_data['lessonname']);
-                            }
-                        });
-                    }
-                },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" }
+                //{
+                //    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+                //    formatterAsync: function (callback, value, row, op, $cell) {
+                //        learun.clientdata.getAsync('custmerData', {
+                //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                //            key: value,
+                //            keyId: 'lessonno',
+                //            callback: function (_data) {
+                //                callback(_data['lessonname']);
+                //            }
+                //        });
+                //    }
+                //},
             ];
             headDataEdit = [
                 {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js

@@ -89,19 +89,20 @@ var bootstrap = function ($, learun) {
                 { label: "年级", name: "Grade", width: 40, align: "left" },
                 { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
                 { label: '学期', name: 'Semester', width: 40, align: "left" },
-                {
-                    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                            key: value,
-                            keyId: 'lessonno',
-                            callback: function (_data) {
-                                callback(_data['lessonname']);
-                            }
-                        });
-                    }
-                },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" }
+                //{
+                //    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+                //    formatterAsync: function (callback, value, row, op, $cell) {
+                //        learun.clientdata.getAsync('custmerData', {
+                //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                //            key: value,
+                //            keyId: 'lessonno',
+                //            callback: function (_data) {
+                //                callback(_data['lessonname']);
+                //            }
+                //        });
+                //    }
+                //},
             ];
             headDataEdit = [
                 {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/Monitor.js

@@ -81,19 +81,20 @@ var bootstrap = function ($, learun) {
                     { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
                     { label: '学期', name: 'Semester', width: 80, align: "left" },
                     { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
-                    {
-                        label: '课程名称', name: 'LessonNo', width: 200, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                                key: value,
-                                keyId: 'lessonno',
-                                callback: function (_data) {
-                                    callback(_data['lessonname']);
-                                }
-                            });
-                        }
-                    },
+                    { label: '课程名称', name: 'LessonName', width: 150, align: "left" },
+                    //{
+                    //    label: '课程名称', name: 'LessonNo', width: 200, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                    //            key: value,
+                    //            keyId: 'lessonno',
+                    //            callback: function (_data) {
+                    //                callback(_data['lessonname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "班级", name: "TeachClassNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js

@@ -89,19 +89,20 @@ var bootstrap = function ($, learun) {
                 { label: "年级", name: "Grade", width: 40, align: "left" },
                 { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
                 { label: '学期', name: 'Semester', width: 40, align: "left" },
-                {
-                    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                            key: value,
-                            keyId: 'lessonno',
-                            callback: function (_data) {
-                                callback(_data['lessonname']);
-                            }
-                        });
-                    }
-                },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" }
+                //{
+                //    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+                //    formatterAsync: function (callback, value, row, op, $cell) {
+                //        learun.clientdata.getAsync('custmerData', {
+                //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                //            key: value,
+                //            keyId: 'lessonno',
+                //            callback: function (_data) {
+                //                callback(_data['lessonname']);
+                //            }
+                //        });
+                //    }
+                //},
             ];
             headDataEdit = [
                 {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js

@@ -89,19 +89,20 @@ var bootstrap = function ($, learun) {
                 { label: "年级", name: "Grade", width: 40, align: "left" },
                 { label: '学年', name: 'AcademicYearNo', width: 50, align: "left" },
                 { label: '学期', name: 'Semester', width: 40, align: "left" },
-                {
-                    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
-                    formatterAsync: function (callback, value, row, op, $cell) {
-                        learun.clientdata.getAsync('custmerData', {
-                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                            key: value,
-                            keyId: 'lessonno',
-                            callback: function (_data) {
-                                callback(_data['lessonname']);
-                            }
-                        });
-                    }
-                },
+                { label: '课程名称', name: 'LessonName', width: 150, align: "left" }
+                //{
+                //    label: '课程名称', name: 'LessonNo', width: 150, align: "left",
+                //    formatterAsync: function (callback, value, row, op, $cell) {
+                //        learun.clientdata.getAsync('custmerData', {
+                //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                //            key: value,
+                //            keyId: 'lessonno',
+                //            callback: function (_data) {
+                //                callback(_data['lessonname']);
+                //            }
+                //        });
+                //    }
+                //},
             ];
             headDataEdit = [
                 {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/Monitor.js

@@ -81,19 +81,20 @@ var bootstrap = function ($, learun) {
                     { label: '学年', name: 'AcademicYearNo', width: 100, align: "left" },
                     { label: '学期', name: 'Semester', width: 80, align: "left" },
                     { label: '课程编号', name: 'LessonNo', width: 100, align: "left" },
-                    {
-                        label: '课程名称', name: 'LessonNo', width: 200, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
-                                key: value,
-                                keyId: 'lessonno',
-                                callback: function (_data) {
-                                    callback(_data['lessonname']);
-                                }
-                            });
-                        }
-                    },
+                    { label: '课程名称', name: 'LessonName', width: 150, align: "left" },
+                    //{
+                    //    label: '课程名称', name: 'LessonNo', width: 200, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                    //            key: value,
+                    //            keyId: 'lessonno',
+                    //            callback: function (_data) {
+                    //                callback(_data['lessonname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: "班级", name: "TeachClassNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlan/OpenLessonPlanEntity.cs

@@ -275,6 +275,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("STATE")]
         public int? State { get; set; }
+        /// <summary>
+        /// 考试类型
+        /// </summary>
+        [Column("EXAMTYPE")]
+        public string ExamType { get; set; }
+
         #endregion
 
         #region  扩展操作
@@ -321,7 +327,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [NotMapped]
         public string LessonTypeId { get; set; }
-        
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs

@@ -91,7 +91,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
                 var strSql = new StringBuilder();
-                strSql.Append("select AcademicYearNo,Semester,lessonno,TeachClassNo,EmpNo,IsEditable,EditUserId,BeginModifyDate,ModifyDate from StuScore where 1=1 ");
+                strSql.Append("select AcademicYearNo,Semester,lessonno,LessonName,TeachClassNo,EmpNo,IsEditable,EditUserId,BeginModifyDate,ModifyDate from StuScore where 1=1 ");
                 if (!queryParam["AcademicYearNo"].IsEmpty())
                 {
                     strSql.Append(" and AcademicYearNo = @AcademicYearNo ");
@@ -102,7 +102,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     strSql.Append(" and Semester =@Semester ");
                     dp.Add("Semester", "" + queryParam["Semester"].ToString() + "", DbType.String);
                 }
-                strSql.Append(" group by AcademicYearNo,Semester,lessonno, TeachClassNo, EmpNo, IsEditable, EditUserId, BeginModifyDate, ModifyDate order by IsEditable, BeginModifyDate, edituserid ");
+                strSql.Append(" group by AcademicYearNo,Semester,lessonno,LessonName, TeachClassNo, EmpNo, IsEditable, EditUserId, BeginModifyDate, ModifyDate order by IsEditable, BeginModifyDate, edituserid ");
                 return this.BaseRepository("CollegeMIS").FindList<StuScoreEntity>(strSql.ToString(), dp);
             }
             catch (Exception ex)