1.修改bug

jack
1 parent 001b21e2
Showing 4 changed files with 25 additions and 30 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
resources/mybatis1/sunvote/PaperMapper.xml
src/com/fh/controller/sunvote/paper/PaperController.java
@@ -33,7 +33,7 @@
     <![endif]-->
 </head>
 <body>
-	<form action="../paper/list2.do?SCHOOL_ID=${pd.SCHOOL_ID }" method="post" name="Form" id="Form">
+	<form action="../paper/list2.do?SCHOOL_ID=${pd.SCHOOL_ID }&SUBJECT_ID=${PD.SUBJECT_ID}" method="post" name="Form" id="Form">
 		<div class="head_box">
 		<div class="box_header">
 			<div class="head_box_l">
@@ -94,11 +94,15 @@
 								<td >${var.TEST_NUM}</td>
 								<td >${var.SCORE}</td>
 								<td>
-								<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a>
+								<c:if test="${var.PAPER_TYPE ==1 }">
+									<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a>
+								</c:if>
 								<c:if test="${var.PAPER_TYPE ==2 }">
 									<a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep3.do?MB1=${pd.MB1 }&PAPER_ID=${var.PAPER_ID}">年级分析</a>
 								</c:if>
-								<a href="#" onclick="del('${var.PAPER_ID}');" style="float:right"><img src="../static/images/remove.png" /></a>
+								<c:if test="${var.PAPER_TYPE ==1 }">
+									<a href="#" onclick="del('${var.PAPER_ID}');" style="float:right"><img src="../static/images/remove.png" /></a>
+								</c:if>
 								</td>
 							</tr>
@@ -269,7 +269,7 @@
 					});
 			$("#qingsongkao_paper").click(function() {
-				var path = "../paper/list2.do?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}";
+				var path = "../paper/list2.do?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}&SUBJECT_ID=${pd.TEACHER.SUBJECT_ID}";
 				//$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
 				if ($("#mainFrame").attr('src') != (path)) {
 					$("#mainFrame").attr('src', path);
@@ -257,7 +257,7 @@
 		<include refid="tableName"></include>
 		where 1 = 1
 		AND 
-		(SCHOOL_ID = #{SCHOOL_ID} AND PAPER_TYPE = '2') OR 
+		(SCHOOL_ID = #{SCHOOL_ID} AND PAPER_TYPE = '2' AND SUBJECT_ID=#{SUBJECT_ID}) OR 
 		(USER_ID = #{USER_ID} AND PAPER_TYPE = #{PAPER_TYPE}) 	
 		order by CREATE_DATE DESC
@@ -931,6 +931,8 @@ public class PaperController extends BaseController {
 					testList.add(test);
 					stu.put("STUDENT_TOTAL", item.get("SCORE"));
 					stu.put("TEST_LIST", testList);
+					stu.put("STUDENT_NUMBER", item.get("STUDENT_NUMBER"));
+					stu.put("STUDENT_PADID", item.get("STUDENT_PADID"));
 					stu.put("TEST_NUM", testList.size() - lost_num);
 					stu.put("LOST_NUM", lost_num);
 					sid.add(item.getString("STUDENT_ID"));
@@ -961,13 +963,15 @@ public class PaperController extends BaseController {
 		Map<String, Object> dataMap = new HashMap<String, Object>();
 		List<String> titles = new ArrayList<String>();
 		titles.add("学生姓名"); // 1
-		titles.add("班级"); // 2
-		titles.add("综合排名"); // 3
-		titles.add("个人平均得分"); // 4
-		titles.add("个人平均得分率"); // 5
+		titles.add("学号"); // 2
+		titles.add("键盘号"); // 3
+		titles.add("班级"); // 4
+		titles.add("综合排名"); // 5
+		//titles.add("个人平均得分"); // 4
+		//titles.add("个人平均得分率"); // 5
 		titles.add("个人得分"); // 6
-		titles.add("测验平均分"); // 7
-		titles.add("测验时间"); // 8
+		//titles.add("测验平均分"); // 7
+		titles.add("测验时间"); // 7
 		dataMap.put("titles", titles);
 		List<PageData> varOList = temp;
@@ -978,36 +982,23 @@ public class PaperController extends BaseController {
 			PageData vpd = new PageData();
 			vpd.put("var1", varOList.get(i).getString("STUDENT_NAME")); // 1
-			vpd.put("var2", varOList.get(i).getString("CLASS_NAME")); // 2
-			vpd.put("var3", i + 1); // 3
-			vpd.put("var4",
-					varOList.get(i).getString("TEST_NUM").equals("0") ? 0
-							: decimalFormat.format(Double.valueOf(varOList.get(
-									i).getString("STUDENT_TOTAL"))
-									/ Double.valueOf(varOList.get(i).getString(
-											"TEST_NUM")))); // 4
-			vpd.put("var5",
-					varOList.get(i).getString("TEST_NUM").equals("0") ? 0+"%"
-							: decimalFormat.format((Double.valueOf(varOList
-									.get(i).getString("STUDENT_TOTAL")) * 100 / Double
-									.valueOf(varOList.get(i).getString(
-											"TEST_NUM")))
-									/ Double.valueOf(pd.getString("SCORE")))+"%"); // 5
+			vpd.put("var2", varOList.get(i).getString("STUDENT_NUMBER")); // 2
+			vpd.put("var3", varOList.get(i).getString("STUDENT_PADID")); // 3
+			vpd.put("var4", varOList.get(i).getString("CLASS_NAME")); // 4
+			vpd.put("var5", i + 1); // 5
 			List<PageData> test_list = (List<PageData>) varOList.get(i).get(
 					"TEST_LIST");
 			List<String> score = new ArrayList<String>();
-			List<String> AVG_SCORE = new ArrayList<String>();
+			
 			List<String> CREATE_DATE = new ArrayList<String>();
 			for (int x = 0; x < test_list.size(); x++) {
 				score.add(test_list.get(x).getString("SCORE"));
-				AVG_SCORE.add(test_list.get(x).getString("AVG_SCORE"));
 				CREATE_DATE.add(test_list.get(x).getString("CREATE_DATE"));
 			}
 			vpd.put("var6", score);
-			vpd.put("var7", AVG_SCORE);
-			vpd.put("var8", CREATE_DATE);
+			vpd.put("var7", CREATE_DATE);
 			varList.add(vpd);
 		}