孙向锦 / SunvoteEducation

Commit ee585cd9d0978864a82d5c2d702e03b96647dfe2

Authored by jack
2 parents 00883406 abd1e786

Merge branch '标准版' of http://120.78.57.84/Elvis/SunvoteEducation into 标准版

Inline Side-by-side
Showing 5 changed files with 8 additions and 8 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
  View file @ee585cd
@@ -90,5 +90,5 @@ @@ -90,5 +90,5 @@
90 window.top.loading.remove(); 90 window.top.loading.remove();
91 }); 91 });
92 </script> 92 </script>
93 - <script src="../static/js/test_list.js?a=2"></script> 93 + <script src="../static/js/test_list.js?a=3"></script>
94 </html> 94 </html>
95 \ No newline at end of file 95 \ No newline at end of file
WebRoot/static/js/test_list.js
  View file @ee585cd
@@ -65,7 +65,7 @@ function getList(start_date, end_date, class_id) { // 获取测验列表 @@ -65,7 +65,7 @@ function getList(start_date, end_date, class_id) { // 获取测验列表
65 }, 65 },
66 success : function(data) { 66 success : function(data) {
67 console.log(data); 67 console.log(data);
68 - if(data.length>0){ 68 + if(data.data.length>0){
69 for (var i = 0; i < data.data.length; i++) { 69 for (var i = 0; i < data.data.length; i++) {
70 tab_html += '<tr><td>' 70 tab_html += '<tr><td>'
71 + (i + 1) 71 + (i + 1)
resources/dbconfig.properties
  View file @ee585cd
1 #数据源 1 1 #数据源 1
2 -#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8  
3 -url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 2 +url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
  3 +#url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
4 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 4 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
5 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 5 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
6 #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 6 #url:jdbc:mysql://120.78.219.152:3306/fhadmin?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
resources/mybatis1/api/V1Mapper.xml
  View file @ee585cd
@@ -141,8 +141,8 @@ @@ -141,8 +141,8 @@
141 LEFT JOIN sv_subject on sv_coursemanagement.SUBJECT_ID = sv_subject.ID 141 LEFT JOIN sv_subject on sv_coursemanagement.SUBJECT_ID = sv_subject.ID
142 LEFT JOIN sv_term on sv_coursemanagement.TERM_ID = sv_term.TERM_ID 142 LEFT JOIN sv_term on sv_coursemanagement.TERM_ID = sv_term.TERM_ID
143 WHERE sv_coursemanagement.TEACHER_ID = #{ID} 143 WHERE sv_coursemanagement.TEACHER_ID = #{ID}
144 - AND sv_term.START_DATE &lt; now()  
145 - AND sv_term.END_DATE &gt; now(); 144 + <!-- AND sv_term.START_DATE &lt; now()
  145 + AND sv_term.END_DATE &gt; now(); -->
146 146
147 </select> 147 </select>
148 148
resources/mybatis1/sunvote/StudentMapper.xml
  View file @ee585cd
@@ -155,8 +155,8 @@ @@ -155,8 +155,8 @@
155 LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID 155 LEFT JOIN sv_term ON cr.TEAMID = sv_term.TERM_ID
156 WHERE 156 WHERE
157 1 = 1 157 1 = 1
158 - AND sv_term.START_DATE &lt; NOW()  
159 - AND sv_term.END_DATE &gt; NOW() 158 + <!-- AND sv_term.START_DATE &lt; NOW()
  159 + AND sv_term.END_DATE &gt; NOW() -->
160 <if test="pd.CLASS_ID!= null and pd.CLASS_ID != ''"><!-- 关键词检索 --> 160 <if test="pd.CLASS_ID!= null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
161 AND cr.SCLASS_ID = #{pd.CLASS_ID} 161 AND cr.SCLASS_ID = #{pd.CLASS_ID}
162 </if> 162 </if>