From a0eff87fa5c0ce395d2fc275441ff84a0ac3d675 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Thu, 6 Jun 2019 16:12:25 +0800
Subject: [PATCH] 修改课后练bug

---
 WebRoot/static/js/teach_paper.js                               |  2 +-
 resources/mybatis1/api/V1Mapper.xml                            |  2 +-
 resources/mybatis1/sunvote/HomeworkMapper.xml                  |  5 +++--
 src/com/fh/controller/api/V1.java                              | 10 ++++++++--
 src/com/fh/controller/sunvote/paper/PaperController.java       |  4 ++--
 src/com/fh/controller/sunvote/question/QuestionController.java |  2 +-
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js
index ea3bb6d..ad23785 100644
--- a/WebRoot/static/js/teach_paper.js
+++ b/WebRoot/static/js/teach_paper.js
@@ -57,7 +57,7 @@
 				success:function(data){
 					console.log(data);
 					for(var i=0;i<data.data.length;i++){
-						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>';
+						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>';
 					}
 					$("#tab_body").html(tab_html);
 					window.top.loading.remove();
diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml
index 1caa796..3119964 100644
--- a/resources/mybatis1/api/V1Mapper.xml
+++ b/resources/mybatis1/api/V1Mapper.xml
@@ -19,7 +19,7 @@
 	<!-- 通过教师ID获取科目数据 -->
 	<select id="getTeacherSubjectInfo" parameterType="pd" resultType="pd">
 		SELECT
-		SUBJECT_ID,CNAME,ENAME
+		SUBJECT_ID,CNAME,ENAME,sv_subject.REMARK
 		FROM
 			sv_coursemanagement
 		LEFT JOIN sv_term ON sv_term.TERM_ID = sv_coursemanagement.TERM_ID
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index f9f8452..71c6d0c 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -263,6 +263,7 @@
 			SUBJECT_ID,	
 			CLASS_ID,	
 			COMPLETE_DATE,	
+			TEACHER_ID,
 			ALL_SCORE,	
 			QUESTION_COUNT,	
 			COMPLETE_DESC,
@@ -289,8 +290,8 @@
 		<if test="TEACHER_ID != null and TEACHER_ID != ''"><!-- 关键词检索 -->
 			and TEACHER_ID = #{TEACHER_ID}
 		</if>
-		<if test="COMPLETE != null and COMPLETE != ''"><!-- 关键词检索 -->
-			and COMPLETE_DATE &gt; #{COMPLETE_DATE}
+		<if test="COMPLETE_DATE != null and COMPLETE_DATE != ''"><!-- 关键词检索 -->
+			and date_format(COMPLETE_DATE,'%Y-%m-%d') = #{COMPLETE_DATE}
 		</if>
 		
 		and IS_DELETE is  null
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index 04bff40..89cdb71 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -593,7 +593,9 @@ public class V1 extends BaseController {
 									.getString("PROBLEM_TYPE_ID"));
 							question.setKnowledge_id(qpd
 									.getString("KNOWLEDGE_ID"));
-							question.setContent(qpd.getString("CONTENT"));
+							String ttcontent = qpd.getString("CONTENT");
+							ttcontent = ttcontent.replaceAll("<fill></fill>", "______");
+							question.setContent(ttcontent);
 							question.setOption_num(qpd.getString("OPTION_NUM"));
 							question.setOption_content(qpd
 									.getString("OPTION_CONTENT"));
@@ -624,7 +626,7 @@ public class V1 extends BaseController {
 											.getString("PROBLEM_TYPE_ID"));
 									qq.setKnowledge_id(q
 											.getString("KNOWLEDGE_ID"));
-									qq.setContent(q.getString("CONTENT"));
+									qq.setContent(q.getString("CONTENT").replaceAll("<fill></fill>", "______"));
 									qq.setOption_num(q.getString("OPTION_NUM"));
 									qq.setOption_content(q
 											.getString("OPTION_CONTENT"));
@@ -2364,6 +2366,10 @@ public class V1 extends BaseController {
 			} else {
 				pad.put("OPTION_CONTENT", new String[] { optionContent });
 			}
+			
+			if(pad.getString("CONTENT") != null){
+				pad.put("CONTENT", pad.getString("CONTENT").replaceAll("<fill></fill>", "______"));
+			}
 		}
 		res.setData(list);
 		return res.toJson();
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index ad74392..c6902c1 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -195,7 +195,7 @@ public class PaperController extends BaseController {
 					question.setChapter_id(qpd.getString("CHAPTER_ID"));
 					question.setProblem_type_id(qpd.getString("PROBLEM_TYPE_ID"));
 					question.setKnowledge_id(qpd.getString("KNOWLEDGE_ID"));
-					question.setContent(qpd.getString("CONTENT"));
+					question.setContent(qpd.getString("CONTENT").replaceAll("<fill></fill>", "______"));
 					question.setOption_num(qpd.getString("OPTION_NUM"));
 					question.setOption_content(qpd.getString("OPTION_CONTENT"));
 					question.setDifficulty(qpd.getString("DIFFICULTY"));
@@ -218,7 +218,7 @@ public class PaperController extends BaseController {
 							qq.setChapter_id(q.getString("CHAPTER_ID"));
 							qq.setProblem_type_id(q.getString("PROBLEM_TYPE_ID"));
 							qq.setKnowledge_id(q.getString("KNOWLEDGE_ID"));
-							qq.setContent(q.getString("CONTENT"));
+							qq.setContent(q.getString("CONTENT").replaceAll("<fill></fill>", "______"));
 							qq.setOption_num(q.getString("OPTION_NUM"));
 							qq.setOption_content(q.getString("OPTION_CONTENT"));
 							qq.setDifficulty(q.getString("DIFFICULTY"));
diff --git a/src/com/fh/controller/sunvote/question/QuestionController.java b/src/com/fh/controller/sunvote/question/QuestionController.java
index a4e0ae0..4664123 100644
--- a/src/com/fh/controller/sunvote/question/QuestionController.java
+++ b/src/com/fh/controller/sunvote/question/QuestionController.java
@@ -317,7 +317,7 @@ public class QuestionController extends BaseController {
 			vpd.put("var5", varOList.get(i).getString("TEACHER_ID"));	    //5
 			vpd.put("var6", varOList.get(i).getString("SCHOOL_ID"));	    //6
 			vpd.put("var7", varOList.get(i).getString("KNOWLEDGE_ID"));	    //7
-			vpd.put("var8", varOList.get(i).getString("CONTENT"));	    //8
+			vpd.put("var8", varOList.get(i).getString("CONTENT").replaceAll("<fill></fill>", "______"));	    //8
 			vpd.put("var9", varOList.get(i).get("OPTION_NUM").toString());	//9
 			vpd.put("var10", varOList.get(i).getString("OPTION_CONTENT"));	    //10
 			vpd.put("var11", varOList.get(i).getString("ANSWER"));	    //11
--
libgit2 0.21.4