From 02f157fa8b53979d346932ec25daea7d6b466517 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Thu, 26 Jul 2018 17:34:28 +0800
Subject: [PATCH] 修复2个bug

---
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp    | 4 +++-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp | 2 +-
 src/com/fh/controller/sunvote/report/ReportController.java  | 7 ++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index d9b7acf..0c65a27 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -111,7 +111,7 @@
 									</td>
 									<td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
 											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
-											maxFractionDigits="1" />%</div></td>
+											maxFractionDigits="2" />%</div></td>
 									<td class="center">${var.GETSCORE }</td>
 									<c:forEach items="${testpaperList}" var="var1" varStatus="vs1">
 										<td class="center"><div style="width:80px;margin:0 auto;"><c:set var="TEST_ID"
@@ -273,6 +273,8 @@
 		});
 		
 		
+		console.log('${studentList}');
+		
 	</script>
 
 </body>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
index 4857d2e..d7af736 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
@@ -87,7 +87,7 @@
 							<c:forEach items="${studentInfo}" var="var" varStatus="vs">
 								<tr>
 									<td class="center">${var.KEYPAD_ID}</td>
-									<td class="center">${var.SNO}</td>
+									<td class="center">${var.NUMBER}</td>
 									<td class="center">${var.NAME}</td>
 									<td class="center">${var.GETSCORE}</td>
 									<%-- <td class="center">${var.RIGHT}</td> --%>
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 3a4f66c..24fd251 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -68,7 +68,12 @@ public class ReportController extends BaseController {
 				studentPageData.put("STUDENT_ID", studentPageData.getString("ID"));
 				List<PageData> studentTestList = studenttestService.listAll(studentPageData);
 				for(PageData studentTestPageData :studentTestList){
-					studentPageData.put(studentTestPageData.getString("TEST_ID"), studentTestPageData.getString("SCORE"));
+					String score = studentTestPageData.getString("SCORE");
+					if(!"0".equals(score)){
+						studentPageData.put(studentTestPageData.getString("TEST_ID"), studentTestPageData.getString("SCORE"));
+					}else{
+						studentPageData.put(studentTestPageData.getString("TEST_ID"), "--");
+					}
 				}
 				int totalScore = 0 ;
 				int getScore = 0 ;
--
libgit2 0.21.4