班级开课计划关联考试类型

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

@@ -258,7 +258,6 @@ var bootstrap = function ($, learun) {
                                 key: value,
                                 code: 'ExamType',
                                 callback: function (_data) {
-                                    console.log(_data.text,"_data")
                                     callback(_data.text);
                                 }
                             });

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

@@ -237,6 +237,18 @@ 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) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     { label: "合上班", name: "RelatedClassNo", width: 80, align: "left" },
                     { label: "拟开教学班数", name: "LessonSortNo", width: 100, align: "left" },
                     { label: "备注", name: "Remark", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs

@@ -121,6 +121,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public int? StartWeek { get; set; }
         [NotMapped]
         public int? EndWeek { get; set; }
+        [NotMapped]
+        public string ExamType { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs

@@ -31,8 +31,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@" * ");
+                strSql.Append(@" t.*,op.ExamType  ");
                 strSql.Append("  FROM TeachClass t ");
+                strSql.Append("  left join openlessonplan  op on op.academicyearno=t.academicyearno and op.semester=t.semester and  op.DeptNo=t.DeptNo and op.majorno =t.majorno ");
+                strSql.Append("  and op.grade =t.grade and op.lessonno =t.lessonno and op.F_SchoolId =t.F_SchoolId ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数