班级开课计划添加查询条件教师

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

@@ -181,13 +181,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             {
                 var lessonList = classInfoIBLL.GetAllClass().
                     Where(x => x.DeptNo == entity[i].DeptNo && x.MajorNo == entity[i].MajorNo && x.Grade == entity[i].Grade)
-                    .OrderBy(x => x.ClassNo).Select(x => x.ClassNo).ToList();
+                    .OrderBy(x => x.ClassNo).Select(field1 => new { field1.ClassNo, field1.ClassName }).ToList();
                 if (lessonList.Count > 0)
                 {
                     for (int j = 0; j < lessonList.Count; j++)
                     {
                         TeachClassEntity TeachEntity = new TeachClassEntity();
-                        TeachEntity.TeachClassNo = lessonList[j];
+                        TeachEntity.TeachClassNo = lessonList[j].ClassNo;
+                        TeachEntity.TeachClassName = lessonList[j].ClassName;
                         TeachEntity.AcademicYearNo = entity[i].AcademicYearNo;
                         TeachEntity.DeptNo = entity[i].DeptNo;
                         TeachEntity.MajorNo = entity[i].MajorNo;

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

@@ -69,6 +69,7 @@ var bootstrap = function ($, learun) {
                             text: "lessonname",
                             maxHeight: 200
                         });
+                        console.log(param);
                     }
                 }
             });

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

@@ -35,14 +35,14 @@
                                     <div class="lr-form-item-title">学期</div>
                                     <div id="Semester"></div>
                                 </div>
-                                @*<div class="col-xs-6 lr-form-item">
-                                    <div class="lr-form-item-title">系部</div>
-                                    <div id="DeptNo"></div>
-                                    </div>*@
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">年级</div>
                                     <div id="Grade"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">教师</div>
+                                    <div id="EmpNo"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">课程</div>
                                     <div id="LessonNo"></div>

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

@@ -36,6 +36,8 @@ var bootstrap = function ($, learun) {
             });
             $('#Semester').lrDataItemSelect({ code: 'Semester' });
             $("#MajorNo").lrselect();
+            $('#EmpNo').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+
             $('#LessonNo').lrselect({
                 placeholder: "请选择课程",
                 allowSearch: true,
@@ -212,7 +214,8 @@ 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: "TeachClassNo", width: 80, align: "left" },
+                    { label: "班级名称", name: "TeachClassName", width: 80, align: "left" },
                     {
                         label: "教师", name: "EmpNo", width: 80, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs

@@ -819,6 +819,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                             Grade = classitemEntity?.Grade,
                             LessonSortNo = teachClassEntity.LessonSortNo,
                             TeachClassNo = teachClassEntity.TeachClassNo,
+                            TeachClassName = teachClassEntity.TeachClassName,
                             EmpNo = teachClassEntity.EmpNo,
                             F_SchoolId = entity.F_SchoolId
                         };

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

@@ -82,6 +82,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("TEACHCLASSNO")]
         public string TeachClassNo { get; set; }
         /// <summary>
+        /// TeachClassNo
+        /// </summary>
+        /// <returns></returns>
+        [Column("TEACHCLASSNAME")]
+        public string TeachClassName { get; set; }
+        /// <summary>
         /// 学生数
         /// </summary>
         /// <returns></returns>

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

@@ -72,6 +72,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("LessonNo", queryParam["LessonNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.LessonNo = @LessonNo ");
                 }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<TeachClassEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)