孙向锦 / SunvoteEducation

Commit a0eff87fa5c0ce395d2fc275441ff84a0ac3d675

Authored by 孙向锦
1 parent 33f45aa9

修改课后练bug

Inline Side-by-side
Showing 6 changed files with 16 additions and 9 deletions
WebRoot/static/js/teach_paper.js
  View file @a0eff87
... ... @@ -57,7 +57,7 @@
57 57 success:function(data){
58 58 console.log(data);
59 59 for(var i=0;i<data.data.length;i++){
60   - tab_html += '<tr data-id="'+data.data[i].PAPER_ID+'" data-classid="'+data.data[i].CLASS_ID+'"><td><input type="checkbox" name="ids" id="ids" value="'+data.data[i].PAPER_ID+'"/>'+(i+1)+'</td><td>'+data.data[i].TITLE+'</td><td>'+getClassName(data.data[i].CLASS_ID)+'</td><td>'+getSubjectName(data.data[i].SUBJECT_ID)+'</td><td>'+data.data[i].EXAM_TIME+'分钟</td><td>'+data.data[i].CREATE_DATE+'</td><td><a onclick="jump($(this))">' + view + '</a></td><td><a href="#" onclick="del($(this));"><img src="../static/images/remove.png" /></a></td></tr>';
  60 + tab_html += '<tr data-id="'+data.data[i].PAPER_ID+'" data-classid="'+data.data[i].CLASS_ID+'"><td><input type="checkbox" name="ids" id="ids" value="'+data.data[i].PAPER_ID+'"/>'+(i+1)+'</td><td>'+data.data[i].TITLE+'</td><td>'+getClassName(data.data[i].CLASS_ID)+'</td><td>'+getSubjectName(data.data[i].SUBJECT_ID)+'</td><td>'+data.data[i].EXAM_TIME+'分钟</td><td>'+data.data[i].CREATE_DATE+'</td><td><a onclick="jump($(this))">查看</a></td><td><a href="#" onclick="del($(this));"><img src="../static/images/remove.png" /></a></td></tr>';
61 61 }
62 62 $("#tab_body").html(tab_html);
63 63 window.top.loading.remove();
... ...
resources/mybatis1/api/V1Mapper.xml
  View file @a0eff87
... ... @@ -19,7 +19,7 @@
19 19 <!-- 通过教师ID获取科目数据 -->
20 20 <select id="getTeacherSubjectInfo" parameterType="pd" resultType="pd">
21 21 SELECT
22   - SUBJECT_ID,CNAME,ENAME
  22 + SUBJECT_ID,CNAME,ENAME,sv_subject.REMARK
23 23 FROM
24 24 sv_coursemanagement
25 25 LEFT JOIN sv_term ON sv_term.TERM_ID = sv_coursemanagement.TERM_ID
... ...
resources/mybatis1/sunvote/HomeworkMapper.xml
  View file @a0eff87
... ... @@ -263,6 +263,7 @@
263 263 SUBJECT_ID,
264 264 CLASS_ID,
265 265 COMPLETE_DATE,
  266 + TEACHER_ID,
266 267 ALL_SCORE,
267 268 QUESTION_COUNT,
268 269 COMPLETE_DESC,
... ... @@ -289,8 +290,8 @@
289 290 <if test="TEACHER_ID != null and TEACHER_ID != ''"><!-- 关键词检索 -->
290 291 and TEACHER_ID = #{TEACHER_ID}
291 292 </if>
292   - <if test="COMPLETE != null and COMPLETE != ''"><!-- 关键词检索 -->
293   - and COMPLETE_DATE &gt; #{COMPLETE_DATE}
  293 + <if test="COMPLETE_DATE != null and COMPLETE_DATE != ''"><!-- 关键词检索 -->
  294 + and date_format(COMPLETE_DATE,'%Y-%m-%d') = #{COMPLETE_DATE}
294 295 </if>
295 296  
296 297 and IS_DELETE is null
... ...
src/com/fh/controller/api/V1.java
  View file @a0eff87
... ... @@ -593,7 +593,9 @@ public class V1 extends BaseController {
593 593 .getString("PROBLEM_TYPE_ID"));
594 594 question.setKnowledge_id(qpd
595 595 .getString("KNOWLEDGE_ID"));
596   - question.setContent(qpd.getString("CONTENT"));
  596 + String ttcontent = qpd.getString("CONTENT");
  597 + ttcontent = ttcontent.replaceAll("<fill></fill>", "______");
  598 + question.setContent(ttcontent);
597 599 question.setOption_num(qpd.getString("OPTION_NUM"));
598 600 question.setOption_content(qpd
599 601 .getString("OPTION_CONTENT"));
... ... @@ -624,7 +626,7 @@ public class V1 extends BaseController {
624 626 .getString("PROBLEM_TYPE_ID"));
625 627 qq.setKnowledge_id(q
626 628 .getString("KNOWLEDGE_ID"));
627   - qq.setContent(q.getString("CONTENT"));
  629 + qq.setContent(q.getString("CONTENT").replaceAll("<fill></fill>", "______"));
628 630 qq.setOption_num(q.getString("OPTION_NUM"));
629 631 qq.setOption_content(q
630 632 .getString("OPTION_CONTENT"));
... ... @@ -2364,6 +2366,10 @@ public class V1 extends BaseController {
2364 2366 } else {
2365 2367 pad.put("OPTION_CONTENT", new String[] { optionContent });
2366 2368 }
  2369 +
  2370 + if(pad.getString("CONTENT") != null){
  2371 + pad.put("CONTENT", pad.getString("CONTENT").replaceAll("<fill></fill>", "______"));
  2372 + }
2367 2373 }
2368 2374 res.setData(list);
2369 2375 return res.toJson();
... ...
src/com/fh/controller/sunvote/paper/PaperController.java
  View file @a0eff87
... ... @@ -195,7 +195,7 @@ public class PaperController extends BaseController {
195 195 question.setChapter_id(qpd.getString("CHAPTER_ID"));
196 196 question.setProblem_type_id(qpd.getString("PROBLEM_TYPE_ID"));
197 197 question.setKnowledge_id(qpd.getString("KNOWLEDGE_ID"));
198   - question.setContent(qpd.getString("CONTENT"));
  198 + question.setContent(qpd.getString("CONTENT").replaceAll("<fill></fill>", "______"));
199 199 question.setOption_num(qpd.getString("OPTION_NUM"));
200 200 question.setOption_content(qpd.getString("OPTION_CONTENT"));
201 201 question.setDifficulty(qpd.getString("DIFFICULTY"));
... ... @@ -218,7 +218,7 @@ public class PaperController extends BaseController {
218 218 qq.setChapter_id(q.getString("CHAPTER_ID"));
219 219 qq.setProblem_type_id(q.getString("PROBLEM_TYPE_ID"));
220 220 qq.setKnowledge_id(q.getString("KNOWLEDGE_ID"));
221   - qq.setContent(q.getString("CONTENT"));
  221 + qq.setContent(q.getString("CONTENT").replaceAll("<fill></fill>", "______"));
222 222 qq.setOption_num(q.getString("OPTION_NUM"));
223 223 qq.setOption_content(q.getString("OPTION_CONTENT"));
224 224 qq.setDifficulty(q.getString("DIFFICULTY"));
... ...
src/com/fh/controller/sunvote/question/QuestionController.java
  View file @a0eff87
... ... @@ -317,7 +317,7 @@ public class QuestionController extends BaseController {
317 317 vpd.put("var5", varOList.get(i).getString("TEACHER_ID")); //5
318 318 vpd.put("var6", varOList.get(i).getString("SCHOOL_ID")); //6
319 319 vpd.put("var7", varOList.get(i).getString("KNOWLEDGE_ID")); //7
320   - vpd.put("var8", varOList.get(i).getString("CONTENT")); //8
  320 + vpd.put("var8", varOList.get(i).getString("CONTENT").replaceAll("<fill></fill>", "______")); //8
321 321 vpd.put("var9", varOList.get(i).get("OPTION_NUM").toString()); //9
322 322 vpd.put("var10", varOList.get(i).getString("OPTION_CONTENT")); //10
323 323 vpd.put("var11", varOList.get(i).getString("ANSWER")); //11
... ...