From 4bf26838378817f14458f18273db608aebfb8f36 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 1 Feb 2023 15:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8A=A1=E7=AE=A1=E7=90=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Exam_ExamPlan/Index.js | 1 + .../Views/Exam_ExamPlanLesson/FormClass.js | 2 +- .../Views/Exam_ExamTeacherTime/Index.js | 7 ------- .../Exam_ExamLesson/Exam_ExamLessonService.cs | 2 +- .../Exam_ExamPlanClass/Exam_ExamPlanClassService.cs | 9 +++++++++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js index cbae5c463..bf7f590c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js @@ -294,6 +294,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamTeacherTime/Index', width: 1000, height: 600, + btn: null, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js index 4c35a6d24..6ff6da698 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js @@ -92,7 +92,7 @@ var bootstrap = function ($, learun) { page.search(); }; // 保存数据 - acceptClick = function (callBack,i) { + acceptClick = function (callBack, i) { var selectedRow = $('#gridtable').jfGridGet('rowdata'); if (selectedRow.length == 0) { return learun.alert.warning("请选择班级！"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js index 1b051e06c..0d3fd98d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js @@ -4,7 +4,6 @@ * 日 期：2022-06-13 15:41 * 描 述：老师时间管理 */ -var acceptClick; var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; @@ -143,11 +142,5 @@ var bootstrap = function ($, learun) { refreshGirdData = function () { $('#gridtable').jfGridSet('reload'); }; - acceptClick = function(callBack) { - if (!!callBack) { - learun.layerClose(window.name); - callBack(); - } - }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs index 9c701d454..e07b9e48d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs @@ -266,7 +266,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ,[LessonNo] ,[ELOrder] ,[ELEnabled],ExamTime,LessonTypeId,DeptNo,MajorNo) -select NEWID(),AcademicYearNo,t.Semester,Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t +select NEWID(),AcademicYearNo,t.Semester,replace(Grade,'级','') Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t left join lessoninfo a on t.lessonno=a.lessonno where t.ExamType='1' and t.lessonsortno=1 and t.AcademicYearNo='{AcademicYearNo}' and t.Semester='{Semester}' and t.[LessonNo] not in (select [LessonNo] from Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' ) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs index 84ce9608a..14cb72eed 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs @@ -265,6 +265,15 @@ and examtime is not null and datediff(day, examdate, '{examPlanLesson.ExamDate}' //{ // entity.ClassStuNum = stuinfo.Count(x => x.ClassNo == entity.ClassNo); //} + var classList = this.BaseRepository("CollegeMIS").FindList(x => x.CheckMark == true); + if (list.Exists(x => string.IsNullOrEmpty(x.ClassName))) + { + foreach (var item in list.Where(x => string.IsNullOrEmpty(x.ClassName)).ToList()) + { + item.ClassName = classList.Where(x => x.ClassNo == item.ClassNo).FirstOrDefault().ClassName; + } + } + this.BaseRepository("CollegeMIS").Insert(list); //更新排考安排课程表实排班级数、实排人数 //排考安排课程表Id