课程表每天10节课改为11节课

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js

@@ -15,8 +15,8 @@ var bootstrap = function ($, learun) {
                     // 数据处理
                     var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>';
                     var weekLists = data.weekList;
-                    //十节课
-                    for (var i = 1; i < 11; i++) {
+                    //十节课  2022.6.14 修改为一天十一节课
+                    for (var i = 1; i < 12; i++) {
                         (function (arg) {
                             var args = arg - 1;
                             var datas = flogs(arg, weekLists, 'time');
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
                     //某节课空
                     function tdHandle() {
                         var html = '';
-                        for (var j = 0; j < 10; j++) {
+                        for (var j = 0; j < 11; j++) {
                             html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>';
                         }
                         return html;
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) {
                     //某节课不空
                     function tdHandles(lists) {
                         var html = '';
-                        for (var k = 1; k < 11; k++) {
+                        for (var k = 1; k < 12; k++) {
                             (function (arg) {
                                 var args = arg - 1;
                                 var datas = flogs2(arg, lists, 'day');
@@ -330,7 +330,7 @@ var bootstrap = function ($, learun) {
                 maxHeight: 300,
                 allowSearch: true,
                 //type: 'multiple',
-                data: [{ text: '1节', value: '1' }, { text: '2节', value: '2' }, { text: '3节', value: '3' }, { text: '4节', value: '4' }, { text: '5节', value: '5' }, { text: '6节', value: '6' }, { text: '7节', value: '7' }, { text: '8节', value: '8' }, { text: '9节', value: '9' }, { text: '10节', value: '10' }],
+                data: [{ text: '1节', value: '1' }, { text: '2节', value: '2' }, { text: '3节', value: '3' }, { text: '4节', value: '4' }, { text: '5节', value: '5' }, { text: '6节', value: '6' }, { text: '7节', value: '7' }, { text: '8节', value: '8' }, { text: '9节', value: '9' }, { text: '10节', value: '10' }, { text: '11节', value: '11' }],
                 value: 'value',
                 text: 'text'
             });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
                     var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>';
                     var weekLists = data.weekList;
                     //十节课
-                    for (var i = 1; i < 11; i++) {
+                    for (var i = 1; i < 12; i++) {
                         (function (arg) {
                             var args = arg - 1;
                             var datas = flogs(arg, weekLists, 'time');
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
                     //某节课空
                     function tdHandle() {
                         var html = '';
-                        for (var j = 0; j < 10; j++) {
+                        for (var j = 0; j < 11; j++) {
                             html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>';
                         }
                         return html;
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) {
                     //某节课不空
                     function tdHandles(lists) {
                         var html = '';
-                        for (var k = 1; k < 11; k++) {
+                        for (var k = 1; k < 12; k++) {
                             (function (arg) {
                                 var args = arg - 1;
                                 var datas = flogs2(arg, lists, 'day');

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermTeach.js

@@ -16,7 +16,7 @@ var bootstrap = function ($, learun) {
                     var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>';
                     var weekLists = data.weekList;
                     //十节课
-                    for (var i = 1; i < 11; i++) {
+                    for (var i = 1; i < 12; i++) {
                         (function (arg) {
                             var args = arg - 1;
                             var datas = flogs(arg, weekLists, 'time');
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) {
                     //某节课空
                     function tdHandle() {
                         var html = '';
-                        for (var j = 0; j < 10; j++) {
+                        for (var j = 0; j < 11; j++) {
                             html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>';
                         }
                         return html;
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) {
                     //某节课不空
                     function tdHandles(lists) {
                         var html = '';
-                        for (var k = 1; k < 11; k++) {
+                        for (var k = 1; k < 12; k++) {
                             (function (arg) {
                                 var args = arg - 1;
                                 var datas = flogs2(arg, lists, 'day');

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

@@ -414,7 +414,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         //直接修改
                         //判断是否冲突（新时间是否存在课程）
                         if (db.FindList<ArrangeLessonTermEntity>(x =>
-                        x.LessonDate == lessonDateNew && x.LessonTime == lessiontimeNow && x.CheckMark == "1" && x.ALTId != keyValue).Count() > 0)
+                        x.LessonDate == lessonDateNew && x.LessonTime == lessiontimeNow && x.CheckMark == "1" && x.TeachClassNo == model.TeachClassNo && x.ALTId != keyValue).Count() > 0)
                         {
                             return "第" + weektime + "周当前课程冲突！";
                         }
@@ -1199,7 +1199,7 @@ WHERE   (AcademicYearNo = '" + strAcademicYear + "') and semester='" + strSemest
                                 MakeDate = now,
                                 AcademicYearNo = item.AcademicYearNo,
                                 Semester = item.Semester,
-                                DeptNo = majorData.FirstOrDefault(m => m.MajorNo ==item.MajorNo)?.DeptNo,
+                                DeptNo = majorData.FirstOrDefault(m => m.MajorNo == item.MajorNo)?.DeptNo,
                                 MajorNo = item.MajorNo,
                                 LessonNo = item.LessonNo,
                                 LessonName = item.LessonName,