diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp index 35421f2..c4a8608 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp @@ -90,5 +90,5 @@ window.top.loading.remove(); }); - + \ No newline at end of file diff --git a/WebRoot/static/js/test_list.js b/WebRoot/static/js/test_list.js index 780d2d0..2b42637 100644 --- a/WebRoot/static/js/test_list.js +++ b/WebRoot/static/js/test_list.js @@ -65,7 +65,7 @@ function getList(start_date, end_date, class_id) { // 获取测验列表 }, success : function(data) { console.log(data); - if(data.length>0){ + if(data.data.length>0){ for (var i = 0; i < data.data.length; i++) { tab_html += '' + (i + 1) diff --git a/resources/dbconfig.properties b/resources/dbconfig.properties index b4d8a66..9689fdc 100644 --- a/resources/dbconfig.properties +++ b/resources/dbconfig.properties @@ -1,6 +1,6 @@ #数据源 1 -#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 -url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 +#url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml index c58f7d5..3651c19 100644 --- a/resources/mybatis1/api/V1Mapper.xml +++ b/resources/mybatis1/api/V1Mapper.xml @@ -141,8 +141,8 @@ LEFT JOIN sv_subject on sv_coursemanagement.SUBJECT_ID = sv_subject.ID LEFT JOIN sv_term on sv_coursemanagement.TERM_ID = sv_term.TERM_ID WHERE sv_coursemanagement.TEACHER_ID = #{ID} - AND sv_term.START_DATE < now() - AND sv_term.END_DATE > now(); + diff --git a/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml index d6b3f97..32b4b69 100644 --- a/resources/mybatis1/sunvote/StudentMapper.xml +++ b/resources/mybatis1/sunvote/StudentMapper.xml @@ -155,8 +155,8 @@ LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID WHERE 1 = 1 - AND sv_term.START_DATE < NOW() - AND sv_term.END_DATE > NOW() + AND cr.SCLASS_ID = #{pd.CLASS_ID}