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

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/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)