diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
index 751bbba..a547d7e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
@@ -114,9 +114,9 @@
maxFractionDigits="2" />%
- %
+ maxFractionDigits="2" />%
@@ -127,15 +127,29 @@
value="${var.ANSWERNUM == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM)*var.QUESTION_SCORE}"
maxFractionDigits="2" />
-
- ${var1} |
-
- %
- |
+
+
+
+
+ ${optin_info[vs.index]} |
+
+ %
+ |
+
+
+ -- |
+ -- |
+
+
-
+ ${var.optin_info[lth]} |
+
+ %
+ |
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index 94abaa4..55fccb1 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -609,15 +609,19 @@ public class PaperController extends BaseController {
s = s.replace("]", "");
List optoin = Arrays.asList(s.split(","));
for(int y = 0 ;yy){
+ nn = Integer.valueOf(optoin.get(y));
+ }else{
+ break;
+ }
vpd.put("var"+(8+2*y), nn); //8
vpd.put("var"+(9+2*y), decimalFormat.format(nn*100/Integer.valueOf(varOList.get(i).getString("ANSWERNUM")))+"%"); //9
}
- vpd.put("var"+(max*2+8), Integer.valueOf(optoin.get(max))); //8
- vpd.put("var"+(max*2+9), decimalFormat.format(Integer.valueOf(optoin.get(max))*100/Integer.valueOf(varOList.get(i).getString("ANSWERNUM")))+"%"); //9
+ vpd.put("var"+(max*2+8), Integer.valueOf(optoin.get(optoin.size()-1))); //8
+ vpd.put("var"+(max*2+9), decimalFormat.format(Integer.valueOf(optoin.get(optoin.size()-1))*100/Integer.valueOf(varOList.get(i).getString("ANSWERNUM")))+"%"); //9
varList.add(vpd);
}
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 6b8adb0..ab158fb 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -99,7 +99,7 @@ public class ReportController extends BaseController {
if(studentPd != null && item.get("STUDENT_ID").equals(studentPd.get("STUDENT_ID"))){
//
String score = item.getString("SCORE");
- if(!"0".equals(score)){
+ if(!"".equals(score)){
studentPd.put(item.get("TEST_ID"), item.get("SCORE"));
}else{
studentPd.put(item.get("TEST_ID"), "--");
@@ -131,7 +131,7 @@ public class ReportController extends BaseController {
studentPd.put("STUDENT_ID", item.get("STUDENT_ID"));
studentPd.put("NAME", item.get("NAME"));
String score = item.getString("SCORE");
- if(!"0".equals(score)){
+ if(!"".equals(score)){
studentPd.put(item.get("TEST_ID"), item.get("SCORE"));
}else{
studentPd.put(item.get("TEST_ID"), "--");
@@ -274,9 +274,9 @@ public class ReportController extends BaseController {
studentTestList.add(tmp);
}else{
if(studentPd != null){
- if(getScore > maxScore){
- maxScore = getScore ;
- }
+// if(getScore > maxScore){
+// maxScore = getScore ;
+// }
studentPd.put("GETSCORE", getScore);
studentPd.put("testList", studentTestList);
studentList.add(studentPd);
@@ -301,6 +301,9 @@ public class ReportController extends BaseController {
studentTestList.add(tmp);
}
+ if(getScore > maxScore){
+ maxScore = getScore ;
+ }
}
if(studentPd != null){
studentPd.put("GETSCORE", getScore);