Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/IndexElective.cshtml

@@ -22,6 +22,14 @@
                                     <div class="lr-form-item-title">课程</div>
                                     <div id="LessonNo" type="lrselect" class="lr-select"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师</div>
+                                    <div id="EmpNo" type="lrselect" class="lr-select"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教室</div>
+                                    <div id="ClassRoomNo" type="lrselect" class="lr-select"></div>
+                                </div>
                             </div>
                         </div>
                     </div>

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

@@ -92,7 +92,20 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-
+            $('#EmpNo').lrselect({
+                placeholder: "请选择老师",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetEmpNoData',
+                value: 'value',
+                text: 'text'
+            });
+            $('#ClassRoomNo').lrselect({
+                placeholder: "请选择教室",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetElectiveClassRoomNoData',
+                value: 'value',
+                text: 'text'
+            });
         },
         // 初始化列表
         initGird: function () {
@@ -104,6 +117,11 @@ var bootstrap = function ($, learun) {
                     { label: "学期", name: "Semester", width: 80, align: "left" },
                     { label: "课程编号", name: "LessonNo", width: 100, align: "left" },
                     { label: "课程名称", name: "LessonName", width: 150, align: "left" },
+                    { label: "节次", name: "LessonSection", width: 100, align: "left" },
+                    { label: "教室编号", name: "ClassRoomNo", width: 100, align: "left" },
+                    { label: "教室", name: "ClassRoomName", width: 100, align: "left" },
+                    { label: "教师编号", name: "EmpNo", width: 100, align: "left" },
+                    { label: "教师名称", name: "EmpName", width: 150, align: "left" },
                     { label: "平时成绩占比", name: "OrdinaryScoreScale", width: 100, align: "left" },
                     { label: "期中成绩占比", name: "TermInScoreScale", width: 100, align: "left" },
                     { label: "期末成绩占比", name: "TermEndScoreScale", width: 100, align: "left" },

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

@@ -151,6 +151,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("LessonName", "%" + queryParam["LessonName"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.LessonName Like @LessonName ");
                 }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo", "%" + queryParam["EmpNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.EmpNo Like @EmpNo ");
+                }
+                if (!queryParam["ClassRoomNo"].IsEmpty())
+                {
+                    dp.Add("ClassRoomNo", "%" + queryParam["ClassRoomNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.ClassRoomNo Like @ClassRoomNo ");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<OpenLessonPlanOfElectiveEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)