From ce1cff6caefa22c1a3772f26fd6b5de18792dac0 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Thu, 12 Jul 2018 17:36:35 +0800
Subject: [PATCH] 报表

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

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 8d45d9f..8fdb3ae 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
@@ -33,7 +33,7 @@
 			<input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
 			<table style="margin-top:5px;">
 				<tr>
-					<td>试卷名称: ${testpaperInfo.NAME}</td>
+					<td>测验名称: ${testpaperInfo.NAME}</td>
 				</tr>
 				<tr>
 					<td>收卷时间: ${testpaperInfo.END_DATE}</td>
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index d039c31..a50c49a 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -217,7 +217,6 @@ public class ReportController extends BaseController {
 	
 	@RequestMapping(value="/test_report")
 	public ModelAndView paper_report() throws Exception{
-		logBefore(logger, Jurisdiction.getUsername()+"测试试卷报表");
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = getPageData();
 		
@@ -239,18 +238,17 @@ public class ReportController extends BaseController {
 			studentPd.put("STUDENT_ID", studentPd.getString("ID"));
 			List<PageData> detail = testpaperinfoService.reportPaperDetail(studentPd);
 			studentPd.put("detail", detail);
-			
+			if(questionList.size() < 1){
+				for(int i = 0 ; i < detail.size(); i++){
+					questionList.add(0);
+				}
+			}
 			float score = 0 ;
 			for(int i = 0 ; i < detail.size(); i++){
 				PageData pad = detail.get(i);
-				if("1".equals(pad.getString("RIGHT"))){
-					if (questionList.size() > i) {
-						questionList.set(i, questionList.get(i) + 1);
-					}else{
-						questionList.add(1);
-					}
+				if ("1".equals(pad.getString("RIGHT"))) {
+					questionList.set(i, questionList.get(i) + 1);
 				}
-				
 				String scoreStr = pad.getString("SCORE");
 				
 				try{
--
libgit2 0.21.4