From b15ada89af03e56f99932c5d948de193f1dd1761 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 14 Jun 2022 15:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=A1=A8=E6=AF=8F=E5=A4=A910?= =?UTF-8?q?=E8=8A=82=E8=AF=BE=E6=94=B9=E4=B8=BA11=E8=8A=82=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/ArrangeLessonTerm/IndexLessonTerm.js | 10 +++++----- .../Views/ArrangeLessonTerm/IndexLessonTermStu.js | 6 +++--- .../Views/ArrangeLessonTerm/IndexLessonTermTeach.js | 6 +++--- .../ArrangeLessonTerm/ArrangeLessonTermService.cs | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js index 45c2576c4..397d036f5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js @@ -15,8 +15,8 @@ var bootstrap = function ($, learun) { // 数据处理 var html = '节次/星期星期一星期二星期三星期四星期五星期六星期日星期八星期九星期十'; 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 += '
'; } 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' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js index a42b5cf7c..7631078c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermStu.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { var html = '节次/星期星期一星期二星期三星期四星期五星期六星期日星期八星期九星期十'; 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 += '
'; } 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'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermTeach.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermTeach.js index b102eedd0..2fcab6769 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermTeach.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTermTeach.js @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { var html = '节次/星期星期一星期二星期三星期四星期五星期六星期日星期八星期九星期十'; 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 += '
'; } 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'); 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 d8cc40f1f..0dec98bcf 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 @@ -414,7 +414,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration //直接修改 //判断是否冲突（新时间是否存在课程） if (db.FindList(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,