班级开课计划页面调整

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

@@ -70,6 +70,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
             var data = teachClassIBLL.GetPageList(paginationobj, queryJson);
+            var studata = stuInfoBasicIBLL.GetAllList();
+            foreach (var item in data)
+            {
+                item.StuNum = studata.Where(o =>
+                    o.DeptNo == item.DeptNo && o.MajorNo == item.MajorNo
+                                            && o.ClassNo == item.TeachClassNo && o.Grade == item.Grade
+                ).Count();
+            }
             var jsonData = new
             {
                 rows = data,

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

@@ -185,12 +185,12 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     {
-                        label: "专业", name: "MajorNo", width: 100, 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',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'majorno',
                                 callback: function (_data) {
                                     callback(_data['majorname']);
                                 }
@@ -198,8 +198,9 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "年级", name: "Grade", width: 50, align: "left" },
+                    { label: "课程编码", name: "LessonNo", width: 200, align: "left" },
                     {
-                        label: "课程", name: "LessonNo", width: 200, 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',
@@ -213,9 +214,20 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "人数", name: "StuNum", width: 80, align: "left" },
                     { label: "上机课时", name: "PracticeHour", width: 80, align: "left" },
-                    { label: "课程区别码", name: "PartCode", width: 80, align: "left" },
                     { label: "班级编号", name: "TeachClassNo", width: 80, align: "left" },
-                    { label: "班级名称", name: "TeachClassName", width: 80, align: "left" },
+                    {
+                        label: "班级名称", name: "TeachClassNo", width: 80, 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: "EmpNo", width: 80, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {