diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp index 9ee95eb..aa3c75a 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp @@ -33,7 +33,7 @@ -
+
@@ -94,11 +94,15 @@ ${var.TEST_NUM} ${var.SCORE} - disabled style="pointer-events:none;color:#ccc" href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩 + + disabled style="pointer-events:none;color:#ccc" href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩 + disabled style="pointer-events:none;color:#ccc" href="<%=basePath%>paper/paperRep3.do?MB1=${pd.MB1 }&PAPER_ID=${var.PAPER_ID}">年级分析 - + + + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index 218aa8f..78d2ffa 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -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(''); if ($("#mainFrame").attr('src') != (path)) { $("#mainFrame").attr('src', path); diff --git a/resources/mybatis1/sunvote/PaperMapper.xml b/resources/mybatis1/sunvote/PaperMapper.xml index 30ada3c..396003e 100644 --- a/resources/mybatis1/sunvote/PaperMapper.xml +++ b/resources/mybatis1/sunvote/PaperMapper.xml @@ -257,7 +257,7 @@ 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 diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java index 0945f36..0a98fee 100644 --- a/src/com/fh/controller/sunvote/paper/PaperController.java +++ b/src/com/fh/controller/sunvote/paper/PaperController.java @@ -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 dataMap = new HashMap(); List titles = new ArrayList(); 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 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 test_list = (List) varOList.get(i).get( "TEST_LIST"); List score = new ArrayList(); - List AVG_SCORE = new ArrayList(); + List CREATE_DATE = new ArrayList(); 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); }