From 92db3fed00d93a6d1a9fecf2402102fc2a36b27b Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 13 Jun 2022 14:01:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=BC=80=E8=AF=BE=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=95=99=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ClassPlanController.cs | 5 +++-- .../EducationalAdministration/Views/ClassPlan/Form.js | 1 + .../Views/ClassPlanTeach/Index.cshtml | 10 +++++----- .../Views/ClassPlanTeach/Index.js | 5 ++++- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 1 + .../TeachClass/TeachClassEntity.cs | 6 ++++++ .../TeachClass/TeachClassService.cs | 5 +++++ 7 files changed, 25 insertions(+), 8 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs index 00ec7b2f3..eb15366b0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ClassPlanController.cs +++ b/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; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js index eb03c43cc..024fb9e46 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlan/Form.js +++ b/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); } } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml index 4a6fdd314..6cf2377a4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.cshtml @@ -35,14 +35,14 @@
学期
- @*
-
系部
-
-
*@ -
+
年级
+
+
教师
+
+
课程
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js index 2755e71ab..3ec306776 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassPlanTeach/Index.js +++ b/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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs index d58701a62..bd4c6d752 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/ArrangeLessonTerm/ArrangeLessonTermService.cs +++ b/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 }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs index c0a69b63d..60a21345b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassEntity.cs +++ b/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; } /// + /// TeachClassNo + /// + /// + [Column("TEACHCLASSNAME")] + public string TeachClassName { get; set; } + /// /// 学生数 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs index 6798daddd..34b009e87 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachClass/TeachClassService.cs +++ b/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(strSql.ToString(), dp, pagination); } catch (Exception ex)