专业开课计划新增一列 课程类型

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

@@ -197,22 +197,9 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/ClassPlan/GetPageList',
                 headData: [
-                    {
-                        label: "校区", name: "F_SchoolId", width: 200, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company',
-                                key: value,
-                                keyId: 'f_companyid',
-                                callback: function (_data) {
-                                    callback(_data['f_fullname']);
-                                }
-                            });
-                        }
-                    },
                     { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },
                     {
                         label: "学期", name: "Semester", width: 50, align: "left",
@@ -226,35 +213,22 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "年级", name: "Grade", width: 50, align: "left" },
+                    { label: "课程编码", name: "LessonNo", width: 200, align: "left" },
+                    { label: "课程名称", name: "LessonName", width: 200, align: "left" },
                     {
-                        label: "系部", name: "DeptNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
-                    {
-                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        label: "课程类型", name: "LessonTypeId", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'ltid',
                                 callback: function (_data) {
-                                    callback(_data['majorname']);
+                                    callback(_data['lessontypename']);
                                 }
                             });
                         }
                     },
-                    { label: "年级", name: "Grade", width: 50, align: "left" },
-                    { label: "课程编码", name: "LessonNo", width: 200, align: "left" },
-                    { label: "课程名称", name: "LessonName", width: 200, align: "left" },
                     {
                         label: "状态", name: "State", width: 100, align: "left",
                         formatter: function (cellvalue, row) {
@@ -266,25 +240,25 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "拟开教学班数", name: "TeachClassNum", width: 100, align: "left" },
-                    { label: "人数", name: "StuNum", width: 80, align: "left" },
+                    //{ label: "人数", name: "StuNum", width: 80, align: "left" },
                     { label: "周课时", name: "WeekLessonHour", width: 80, align: "left" },
                     { label: "教室课时", name: "WeekHourClassroom", width: 80, align: "left" },
                     { label: "上机课时", name: "PracticeHour", width: 80, align: "left" },
                     { label: "起始周次", name: "StartWeek", width: 80, align: "left" },
-                    { label: "结束周次", name: "EndWeek", width: 80, align: "left" },
-                    {
-                        label: "负责开课院系", name: "TeachDeptNo", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
-                                key: value,
-                                keyId: 'deptno',
-                                callback: function (_data) {
-                                    callback(_data['deptname']);
-                                }
-                            });
-                        }
-                    },
+                    //{ label: "结束周次", name: "EndWeek", width: 80, align: "left" },
+                    //{
+                    //    label: "负责开课院系", name: "TeachDeptNo", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                    //            key: value,
+                    //            keyId: 'deptno',
+                    //            callback: function (_data) {
+                    //                callback(_data['deptname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     { label: "学分", name: "StudyScore", width: 80, align: "left" },
                     { label: "备注", name: "Remark", width: 100, align: "left" },
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -7926,6 +7926,7 @@
     <None Include="Properties\PublishProfiles\FolderProfile3.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile5.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile6.pubxml" />
     <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
   </ItemGroup>
   <ItemGroup>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ClassPlan/ClassPlanService.cs

@@ -32,8 +32,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@" * ");
+                strSql.Append(@" t.*,l.LessonTypeId ");
                 strSql.Append("  FROM OpenLessonPlan t ");
+                strSql.Append("  left join lessoninfo l on t.lessonno=l.lessonno ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数

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

@@ -316,6 +316,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [NotMapped]
         public string TeachNo { get; set; }
 
+        /// <summary>
+        /// 课程类型
+        /// </summary>
+        [NotMapped]
+        public string LessonTypeId { get; set; }
+        
         #endregion
     }
 }