1.bug修复

jack
1 parent c33910d6
Showing 2 changed files with 19 additions and 11 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
src/com/fh/controller/sunvote/paper/PaperController.java
@@ -82,7 +82,7 @@
 						<th><div style="width:80px">答案</div></th>
 						<th><div style="width:80px">答题人数</div></th>
 						<th><div style="width:80px">正确人数</div></th>
-						<th><div style="width:80px" title="正确率=正确人数/答题人数">正确率<img src="../static/images/tip.png" style="width:16px"></div></th>
+						<th><div style="width:80px" title="正确率=正确人数/答题人数*100">正确率<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px">满分值</div></th>
 						<th><div style="width:80px" title="平均分=正确人数/答题人数*题目分数">平均分<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<c:forEach begin="0" end="${pd.MAX-1}" var="var" varStatus="vs">
@@ -90,7 +90,7 @@
 							<th><div style="width:80px" title="选${myelfun:jstlInt2Char(var+1)}比例=选${myelfun:jstlInt2Char(var+1)}人数/答题人数*100">选${myelfun:jstlInt2Char(var+1)}比例<img src="../static/images/tip.png" style="width:16px"></div></th>
 						</c:forEach>
 						<th><div style="width:80px">漏选人数</div></th>
-						<th><div style="width:80px">漏选比例</div></th>
+						<th><div style="width:80px" title="漏选比例=漏选人数/班级总人数*100">漏选比例<img src="../static/images/tip.png" style="width:16px"></div></th>
 					</tr>
 				</thead>
@@ -99,13 +99,13 @@
 					<c:when test="${not empty varList}">
 						<c:forEach items="${varList}" var="var" varStatus="vs">
-						<c:set var="right" value="${var.ANSWERNUM2 == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM2 * 100)}"></c:set>
+						<c:set var="right" value="${var.ANSWERNUM == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM * 100)}"></c:set>
 							<tr>
 								<td>${var.QUESTION_RANK}</td>
 								<td>${var.ANSWER}</td>
-								<td >${var.ANSWERNUM2}</td>
+								<td >${var.ANSWERNUM}</td>
 								<td >${var.RIGHTNUM}</td>
 								<td >
 									<c:if test="${right<=50}">
@@ -124,7 +124,7 @@
 								<td >${var.QUESTION_SCORE}</td>
 								<td >
 									<fmt:formatNumber type="number"
-									value="${var.ANSWERNUM2 == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM2)*var.QUESTION_SCORE}"
+									value="${var.ANSWERNUM == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM)*var.QUESTION_SCORE}"
 									maxFractionDigits="2" />
 								</td>
 								<c:set var="lth" value="${fn:length(var.optin_info)-1}"></c:set>
@@ -134,7 +134,7 @@
 									    <td>${optin_info[vs.index]}</td>
 										<td>
 											<fmt:formatNumber type="number"
-										value="${var.ANSWERNUM2 == 0 ? 0: (optin_info[vs.index] / var.ANSWERNUM2 * 100)}"
+										value="${var.ANSWERNUM == 0 ? 0: (optin_info[vs.index] / var.ANSWERNUM * 100)}"
 										maxFractionDigits="2" />%
 										</td>
 									</c:if>
@@ -442,10 +442,13 @@ public class PaperController extends BaseController {
 				temp.put("TEST_ID", tpListArray);
 				List<PageData> queInfo = testpaperinfoService.listTestPaperQuestionIDinfo(temp);
-				List<PageData> answer_num = testpaperService.listAll(pd);
 				int answer[] = new int[option_num+1];
 				int right = 0;
+				int lost = 0;
 				for(int j=0;j<queInfo.size();j++){
+					if(queInfo.get(j).get("ANSWER").toString().isEmpty()){
+						lost++;
+					}
 					if(queInfo.get(j).get("RIGHT")!=null&&!queInfo.get(j).get("RIGHT").toString().isEmpty()){
 						if(queInfo.get(j).get("RIGHT").toString().equals("1")){
 							right++;
@@ -464,8 +467,8 @@ public class PaperController extends BaseController {
 					}
 				}
 				temp.put("RIGHTNUM", right);
-				temp.put("ANSWERNUM",queInfo.size());
-				temp.put("ANSWERNUM2",answer_num.size());
+				temp.put("ANSWERNUM",(queInfo.size()-lost));
+				temp.put("ANSWERNUM2",queInfo.size());
 				temp.put("optin_info", answer);
 				templist.add(temp);
 			}
@@ -533,7 +536,11 @@ public class PaperController extends BaseController {
 				List<PageData> queInfo = testpaperinfoService.listTestPaperQuestionIDinfo(temp);
 				int answer[] = new int[option_num+1];
 				int right = 0;
+				int lost = 0;
 				for(int j=0;j<queInfo.size();j++){
+					if(queInfo.get(j).get("ANSWER").toString().isEmpty()){
+						lost++;
+					}
 					if(queInfo.get(j).get("RIGHT")!=null&&!queInfo.get(j).get("RIGHT").toString().isEmpty()){
 						if(queInfo.get(j).get("RIGHT").toString().equals("1")){
 							right++;
@@ -552,7 +559,8 @@ public class PaperController extends BaseController {
 					}
 				}
 				temp.put("RIGHTNUM", right);
-				temp.put("ANSWERNUM",queInfo.size());
+				temp.put("ANSWERNUM",(queInfo.size()-lost));
+				temp.put("ANSWERNUM2",queInfo.size());
 				temp.put("optin_info", JSONUtils.toJSONString(answer));
 				templist.add(temp);
 			}
@@ -623,7 +631,7 @@ public class PaperController extends BaseController {
 			}
 			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
+			vpd.put("var"+(max*2+9), decimalFormat.format(Integer.valueOf(optoin.get(optoin.size()-1))*100/Integer.valueOf(varOList.get(i).getString("ANSWERNUM2")))+"%");	    //9
 			varList.add(vpd);
 		}