开课计划专业开课计划 班级开课计划调整

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

@@ -188,7 +188,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
                     {
                         TeachClassEntity TeachEntity = new TeachClassEntity();
                         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,7 +69,6 @@ var bootstrap = function ($, learun) {
                             text: "lessonname",
                             maxHeight: 200
                         });
-                        console.log(param);
                     }
                 }
             });

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

@@ -5,25 +5,21 @@
 <div class="lr-layout lr-layout-left-center" id="lr_layout">
     <div class="lr-layout-left">
         <div class="lr-layout-wrap">
-            <div class="lr-layout-title lrlt ">学校信息</div>
+            <div class="lr-layout-title lrlt ">系部信息</div>
             <div id="cddeptTree" class="lr-layout-body"></div>
         </div>
     </div>
     <div class="lr-layout-center">
         <div class="lr-layout-wrap">
             <div class="lr-layout-title">
-                <span id="titleinfo" class="lrlt">未选择学校</span> - <span class="lrlt">专业信息</span>
+                <span id="titleinfo" class="lrlt">未选择系部</span> - <span class="lrlt">系部信息</span>
             </div>
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学校</div>
-                                    <div id="F_SchoolId"></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="MajorNo"></div>
                                 </div>
@@ -39,7 +35,7 @@
                                 <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>

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

@@ -18,7 +18,7 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
+            //$('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
@@ -35,6 +35,7 @@ var bootstrap = function ($, learun) {
                 text: 'text'
             });
             $('#Semester').lrDataItemSelect({ code: 'Semester' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#MajorNo').lrselect({
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
                 param: { strWhere: " 1=1 and CheckMark=1  " },
@@ -222,8 +223,22 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "年级", name: "Grade", width: 50, align: "left" },
+                    { label: "专业编码", name: "MajorNo", width: 120, align: "left" },
+                    {
+                        label: "专业名称", name: "MajorNo", width: 200, align: "left" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
                     { label: "课程编码", name: "LessonNo", width: 200, align: "left" },
-                    { label: "课程名称", name: "LessonName", width: 200, align: "left" },
+                    { label: "课程名称", name: "LessonName", width: 200, align: "left", },
                     {
                         label: "课程类型", name: "LessonTypeId", width: 200, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {

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

@@ -5,28 +5,28 @@
 <div class="lr-layout lr-layout-left-center" id="lr_layout">
     <div class="lr-layout-left">
         <div class="lr-layout-wrap">
-            <div class="lr-layout-title lrlt ">学校信息</div>
+            <div class="lr-layout-title lrlt ">系部信息</div>
             <div id="cddeptTree" class="lr-layout-body"></div>
         </div>
     </div>
     <div class="lr-layout-center">
         <div class="lr-layout-wrap">
             <div class="lr-layout-title">
-                <span id="titleinfo" class="lrlt">未选择学校</span> - <span class="lrlt">专业信息</span>
+                <span id="titleinfo" class="lrlt">系部学校</span> - <span class="lrlt">系部信息</span>
             </div>
             <div class="lr-layout-tool">
                 <div class="lr-layout-tool-left">
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学校</div>
-                                    <div id="F_SchoolId"></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="MajorNo"></div>
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
                                 <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">学年</div>
                                     <div id="AcademicYearNo"></div>

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

@@ -18,7 +18,6 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 250, 400);
-            $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' });
             $('#AcademicYearNo').lrselect({
                 placeholder: "请选择学年",
                 allowSearch: true,
@@ -35,8 +34,10 @@ var bootstrap = function ($, learun) {
                 text: 'text'
             });
             $('#Semester').lrDataItemSelect({ code: 'Semester' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $("#MajorNo").lrselect();
             $('#EmpNo').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
 
             $('#LessonNo').lrselect({
                 placeholder: "请选择课程",
@@ -228,8 +229,9 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "教师编号", name: "EmpNo", width: 80, align: "left" },
                     {
-                        label: "教师", name: "EmpNo", width: 80, align: "left",
+                        label: "教师名称", name: "EmpNo", width: 80, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',

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

@@ -819,7 +819,6 @@ 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,12 +82,6 @@ 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

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