学生选修课列表增加课程类型列

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/StudentIndex.js

@@ -176,7 +176,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/OpenLessonPlanOfElective/GetPageListOfStudent',
                 headData: [
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
@@ -196,6 +196,21 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "课程类型", name: "LessonTypeId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            console.log(row.LessonTypeId);
+
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType',
+                                key: row.LessonTypeId,
+                                keyId: 'ltid',
+                                callback: function (_data) {
+                                    callback(_data['lessontypename']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "上课节次", name: "LessonSection", width: 150, align: "left",
                         formatter: function (cellvalue, row) {

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

@@ -68,7 +68,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetPageList',
                 headData: [
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left"},
@@ -87,6 +87,21 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "课程类型", name: "LessonTypeId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            console.log(row.LessonTypeId);
+
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdLessonType',
+                                key: row.LessonTypeId,
+                                keyId: 'ltid',
+                                callback: function (_data) {
+                                    callback(_data['lessontypename']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "上课节次", name: "LessonSection", width: 150, align: "left",
                         formatter: function (cellvalue, row) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuSelectLessonListOfElective/QueryStuSelectResult.js

@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuSelectLessonListOfElective/GetQueryStuSelectResultList',
                 headData: [
                     { label: "学年", name: "AcademicYearNo", width: 80, align: "left" },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveEntity.cs

@@ -222,6 +222,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [NotMapped] public string LessonNo2 { get; set; }
         [NotMapped] public string EmpNo2 { get; set; }
+        [NotMapped] public string LessonTypeId { get; set; }
+
         /// <summary>
         /// 选课专业列表
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs

@@ -100,9 +100,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var EADateArrangeEntityAboutElective = this.BaseRepository("CollegeMIS").FindEntity<EADateArrangeEntity>(x => x.WorkName == "选课" && x.MakeDate <= now && x.EndDate >= now && x.CheckMark == "1");
 
                 var strSql = new StringBuilder();
-                strSql.Append(@"select b.*,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id 
+                strSql.Append(@"select b.*,leif.LessonTypeId,c.StuNo,c.StuName,c.Status,cp.Status as StatusPre from ElectiveMajor a left join OpenLessonPlanOfElective b on a.OLPOEId=b.Id 
 	                              left join StuSelectLessonListOfElective c on b.Id=c.OLPEId and c.StuNo=@StuNo
-                                  left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo
+                                  left join StuSelectLessonListOfElectivePre cp on b.Id=cp.OLPEId and cp.StuNo=@StuNo left join LessonInfo leif on b.LessonNo=leif.LessonNo 
 	                               where not exists ( ");
                 //不显示与已选课程 相同课程名称相同教师的课程
                 strSql.Append(" select * from StuSelectLessonListOfElective s where s.AcademicYearNo='" + EADateArrangeEntityAboutElective?.AcademicYearNo + "' and s.Semester='" + EADateArrangeEntityAboutElective?.Semester + "' and s.StuNo=@StuNo and s.Status <>3 and s.LessonName=b.LessonName and s.EmpNo=b.EmpNo and s.OLPEId!=b.Id ");

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveEntity.cs

@@ -212,6 +212,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         #region  扩展字段
 
         [NotMapped] public string F_SchoolId { get; set; }
+        [NotMapped] public string LessonTypeId { get; set; }
 
         #endregion
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuSelectLessonListOfElective/StuSelectLessonListOfElectiveService.cs

@@ -29,8 +29,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.* ");
-                strSql.Append("  FROM StuSelectLessonListOfElective t ");
+                strSql.Append("SELECT t.*,leif.LessonTypeId ");
+                strSql.Append("  FROM StuSelectLessonListOfElective t left join LessonInfo leif on t.LessonNo=leif.LessonNo ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数