From 3e7e189fa432cff50c121db3a7acc736b2115e23 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Mon, 31 Oct 2022 11:28:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TeacherOpenCourseScheduleSession.http | 78 ++++++++----------- httpTest/http-client.private.env.json | 2 +- .../jlw/teacherOpenCourseScheduleSession.md | 2 +- .../teacherOpenCourseScheduleSession/index.js | 4 +- 4 files changed, 38 insertions(+), 48 deletions(-) diff --git a/httpTest/TeacherOpenCourseScheduleSession.http b/httpTest/TeacherOpenCourseScheduleSession.http index f238746a..0a69c3d0 100644 --- a/httpTest/TeacherOpenCourseScheduleSession.http +++ b/httpTest/TeacherOpenCourseScheduleSession.http @@ -3,66 +3,56 @@ POST {{baseURL}}/jlw/teacherOpenCourseScheduleSession/addSession.json Content-Type: application/json Cookie: JSESSIONID={{session}} -{ - "startTime": "2022-10-25", - "weekNum": "3", - "openOnHolidays": false, - "weekDetail": [ - "T1", - "T2", - "T3", - "T4", - "T5" - ], - "schoolClassIdPlural": "5,11,8", - "teacherId": "1", - "teacherOpenCourseId": "1569", - "sessionClassList": { - "1568607566282530816": [ - 1568633666106728448, - 1568634328282472448, - 1568634328282472448 - ], - "1568621132431663104": [ - 1586024846784110592, - 1586025166549458944 - ] - } -} - //{ // "startTime": "2022-10-25", -// "weekNum": "4", +// "weekNum": "3", // "openOnHolidays": false, // "weekDetail": [ // "T1", // "T2", // "T3", -// "T4" +// "T4", +// "T5" // ], -// "schoolClassIdPlural": "12,13,14,7,9", -// "teacherId": "40", -// "teacherOpenCourseId": "1569699103338831872", +// "schoolClassIdPlural": "5,11,8", +// "teacherId": "1", +// "teacherOpenCourseId": "1569", // "sessionClassList": { // "1568607566282530816": [ -// { -// "teacherOpenCourseScheduleSessionTagName": "第三节", -// "teacherOpenCourseScheduleSessionTagDuration": 40, -// "teacherOpenCourseScheduleSessionTagStartTime": "13:00", -// "teacherOpenCourseScheduleSessionTagEndTime": "13:40" -// } +// 1568633666106728448, +// 1568634328282472448, +// 1568634328282472448 // ], // "1568621132431663104": [ -// { -// "teacherOpenCourseScheduleSessionTagName": "第四节", -// "teacherOpenCourseScheduleSessionTagDuration": 60, -// "teacherOpenCourseScheduleSessionTagStartTime": "14:00", -// "teacherOpenCourseScheduleSessionTagEndTime": "15:00" -// } +// 1586024846784110592, +// 1586025166549458944 // ] // } //} +{ + "startTime": "2022-10-25", + "weekNum": "4", + "openOnHolidays": false, + "weekDetail": [ + "T1", + "T2", + "T3", + "T4" + ], + "schoolClassIdPlural": "12,13,14,7,9", + "teacherId": "40", + "teacherOpenCourseId": "1569699103338831872", + "sessionClassList": { + "1568607566282530816": [ + 1586025337723199488 + ], + "1568621132431663104": [ + 1586025244957777920 + ] + } +} + ### 排课列表 POST {{baseURL}}/jlw/teacherOpenCourseScheduleSession/groupList.json Content-Type: application/x-www-form-urlencoded diff --git a/httpTest/http-client.private.env.json b/httpTest/http-client.private.env.json index 4a51a20e..5617ee70 100644 --- a/httpTest/http-client.private.env.json +++ b/httpTest/http-client.private.env.json @@ -1,6 +1,6 @@ { "dev": { "baseURL": "http://localhost:9090/server/", - "session": "62D623753A1720CFFA22B764459D8F2A" + "session": "4DF96B3C791C90F8696C81F5EED4F81C" } } \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md index b435cc09..b5a306da 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md @@ -115,7 +115,7 @@ queryByConditionGroup and t.teacher_open_course_schedule_session_add_time =#teacherOpenCourseScheduleSessionAddTime# @} @if(isEmpty(teacherOpenCourseScheduleSessionStatus) && isEmpty(teacherOpenCourseScheduleSessionStatusPlural)){ - and t.teacher_open_course_schedule_session_status != 2 + and t.teacher_open_course_schedule_session_status in (1,2) @}else{ @if(!isEmpty(teacherOpenCourseScheduleSessionStatus)){ and t.teacher_open_course_schedule_session_status =#teacherOpenCourseScheduleSessionStatus# diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js index c064ff6f..806c8b10 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/index.js @@ -187,7 +187,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { } else if (obj.event == "enable") { layer.confirm('是否确定启用该信息？', function (index) { var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json", - {teacherOpenCourseId: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:1}); + {teacherOpenCourseScheduleSessionId: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:1}); layer.msg(ret.code == 0 ? "启用成功！" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, @@ -201,7 +201,7 @@ layui.define([ 'form', 'laydate', 'table' ,'laytpl'], function(exports) { } else if (obj.event == "disable") { layer.confirm('是否确定禁用该信息？', function (index) { var ret = Common.postAjax("/jlw/teacherOpenCourseScheduleSession/edit.json", - {ids: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:2}); + {teacherOpenCourseScheduleSessionId: data.teacherOpenCourseScheduleSessionId,teacherOpenCourseScheduleSessionStatus:2}); layer.msg(ret.code == 0 ? "禁用成功！" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2,