From 27a15f6c960ea9709073b8380fa1a5038f61ab5b Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Mon, 8 Jul 2019 16:46:30 +0800
Subject: [PATCH] 课后练bug修改

---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp       |  8 ++++----
 resources/mybatis1/sunvote/HomeworkMapper.xml                  |  9 +++++++++
 src/com/fh/bean/ResultHomework.java                            | 11 +++++++++++
 src/com/fh/controller/api/V1.java                              |  1 +
 src/com/fh/controller/sunvote/homework/HomeworkController.java |  4 ++--
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index 2a56b9e..e7c4673 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -137,7 +137,7 @@
 		height:0;
 		}
 	.student_list li{
-		width:120px;
+		min-width:120px;
 		height:20px;
 		list-style:none;
 		text-align:center;
@@ -264,7 +264,7 @@
 				for(i = 0;i<ans_arry.length;i++){
 					temp = parseInt(ans_arry[i].replace("%",""));
 					if(temp>=80){
-						_html+='<li class="list correct" data-dfl="'+ans_arry[i]+'">'+i+'('+ans_arry[i]+')'+'</li>';
+						_html+='<li class="list correct" data-dfl="'+ans_arry[i]+'">'+(i+1)+'('+ans_arry[i]+')'+'</li>';
 					}else{
 						_html+='<li class="list erro" data-dfl="'+ans_arry[i]+'">'+(i+1)+'('+ans_arry[i]+')'+'</li>';
 					}				
@@ -307,7 +307,7 @@
 							 }
 						 }
 						 var student_option_list='';
-						 for(i=1;i<data[0].length;i++){
+						 for(i=0;i<data[0].length;i++){
 							 student_option_list+='<li>'+data[0][i]+'</li>';
 						 }
 						 $(".student_list").html(student_option_list);
@@ -351,7 +351,7 @@
 				 var _index = $(this).closest(".ans_list").index();
 				 console.log(data[_index].length);
 				 var student_option_list='';
-				 for(i=1;i<data[_index].length;i++){
+				 for(i=0;i<data[_index].length;i++){
 					 student_option_list+='<li>'+data[_index][i]+'</li>';
 				 }
 				 $(".student_list").html(student_option_list);
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index e115e78..434291c 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -126,6 +126,8 @@
 			QUESTION_COUNT = #{QUESTION_COUNT},
 			</if><if test="ANSWER_PERSENT != null and ANSWER_PERSENT != ''">
 			ANSWER_PERSENT = #{ANSWER_PERSENT},
+			</if><if test="COMPLETE_PERSENT != null and COMPLETE_PERSENT != ''">
+			COMPLETE_PERSENT = #{COMPLETE_PERSENT},
 			</if>
 		HOMEWORK_ID = HOMEWORK_ID
 		where 
@@ -214,6 +216,9 @@
 		<if test="pd.ENDDATE != null and pd.ENDDATE != ''"><!-- 关键词检索 -->
 			and COMPLETE_DATE &lt; #{pd.ENDDATE}
 		</if>
+		<if test="pd.COMPLETE_PERSENT != null and pd.COMPLETE_PERSENT != ''"><!-- 关键词检索 -->
+			and COMPLETE_PERSENT &lt; #{pd.COMPLETE_PERSENT}
+		</if>
 		<if test="pd.STATUS != null and pd.STATUS != ''"><!-- 关键词检索 -->
 			and COMPLETE_COUNT = #{pd.STATUS}
 		</if>
@@ -256,6 +261,9 @@
 		<if test="COMPLETE_COUNT != null and COMPLETE_COUNT != ''"><!-- 关键词检索 -->
 			and COMPLETE_COUNT = #{COMPLETE_COUNT}
 		</if>
+		<if test="COMPLETE_PERSENT != null and COMPLETE_PERSENT != ''"><!-- 关键词检索 -->
+			and COMPLETE_PERSENT = #{COMPLETE_PERSENT}
+		</if>
 		ORDER BY COMPLETE_DATE DESC
 	</select>
 	
@@ -331,6 +339,7 @@
 				sv_homework.GET_MAX_SCORE,
 				sv_homeworkreport.STUDNET_NO,
 				sv_homework.COMPLETE_DATE,
+				sv_homework.COMPLETE_PERSENT,
 				sv_homeworkreport.GET_SCORE as STUDENT_SCORE
 		FROM
 			sv_homework
diff --git a/src/com/fh/bean/ResultHomework.java b/src/com/fh/bean/ResultHomework.java
index 4907271..662da26 100644
--- a/src/com/fh/bean/ResultHomework.java
+++ b/src/com/fh/bean/ResultHomework.java
@@ -14,6 +14,7 @@ public class ResultHomework {
 	private String GET_MAX_SCORE;
 	private String ANSWER_PERSENT;
 	private String GET_MIN_SCORE;
+	private String COMPLETE_PERSENT;
 	private List<ResultStudent> STUDENTS;
 
 	public void setHOMEWORK_ID(String HOMEWORK_ID) {
@@ -80,6 +81,16 @@ public class ResultHomework {
 		GET_MIN_SCORE = gET_MIN_SCORE;
 	}
 	
+	
+	
+	public String getCOMPLETE_PERSENT() {
+		return COMPLETE_PERSENT;
+	}
+
+	public void setCOMPLETE_PERSENT(String cOMPLETE_PERSENT) {
+		COMPLETE_PERSENT = cOMPLETE_PERSENT;
+	}
+
 	public String getANSWER_PERSENT() {
 		return ANSWER_PERSENT;
 	}
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index e892dae..90dd475 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -2910,6 +2910,7 @@ public class V1 extends BaseController {
 			homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE());
 			homePd.put("GET_MIN_SCORE", resultHomework.getGET_MIN_SCORE());
 			homePd.put("ANSWER_PERSENT", resultHomework.getANSWER_PERSENT());
+			homePd.put("COMPLETE_PERSENT", resultHomework.getCOMPLETE_PERSENT());
 			homePd.put("COMPLETE_COUNT", "1");
 			homeworkService.edit(homePd);
 			List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 6c27698..2b1b6b3 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -337,7 +337,7 @@ public class HomeworkController extends BaseController {
 		String homeworkId = pageData.getString("HOMEWORK_ID");
 		String index = pageData.getString("INDEX");
 		int indexint = Integer.parseInt(index);
-		List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
+		List<PageData> data = homeworkReporkService.findByHomeworkID(pageData);
 		pageData = homeworkService.findById(pageData);
 		pageData.put("RANK", indexint);
 		pageData = homeworkproblemService.findByCodeAndRank(pageData);
@@ -361,7 +361,7 @@ public class HomeworkController extends BaseController {
 							char option = (char)('A' + i) ;
 							if(anss[0] != null){
 								if(anss[0].contains("" + option)){
-									optionAnswer.add(pd.getString("STUDENT_NAME"));
+									optionAnswer.add(pd.getString("STUDENT_NAME") + "(" + anss[0] + ")");
 								}
 							}
 						}
--
libgit2 0.21.4