考务管理优化

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);
                     }

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("请选择班级！");

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();
 }

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}' )

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<ClassInfoEntity>(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