孙向锦 / SunvoteEducation

Commit 41772c654685c96f2876ee956626ee6a12e8e186

Authored by jack
1 parent 001b21e2

1.修改bug

Inline Side-by-side
Showing 4 changed files with 25 additions and 30 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
  View file @41772c6
... ... @@ -33,7 +33,7 @@
33 33 <![endif]-->
34 34 </head>
35 35 <body>
36   - <form action="../paper/list2.do?SCHOOL_ID=${pd.SCHOOL_ID }" method="post" name="Form" id="Form">
  36 + <form action="../paper/list2.do?SCHOOL_ID=${pd.SCHOOL_ID }&SUBJECT_ID=${PD.SUBJECT_ID}" method="post" name="Form" id="Form">
37 37 <div class="head_box">
38 38 <div class="box_header">
39 39 <div class="head_box_l">
... ... @@ -94,11 +94,15 @@
94 94 <td >${var.TEST_NUM}</td>
95 95 <td >${var.SCORE}</td>
96 96 <td>
97   - <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>
  97 + <c:if test="${var.PAPER_TYPE ==1 }">
  98 + <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>
  99 + </c:if>
98 100 <c:if test="${var.PAPER_TYPE ==2 }">
99 101 <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>
100 102 </c:if>
101   - <a href="#" onclick="del('${var.PAPER_ID}');" style="float:right"><img src="../static/images/remove.png" /></a>
  103 + <c:if test="${var.PAPER_TYPE ==1 }">
  104 + <a href="#" onclick="del('${var.PAPER_ID}');" style="float:right"><img src="../static/images/remove.png" /></a>
  105 + </c:if>
102 106 </td>
103 107 </tr>
104 108  
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @41772c6
... ... @@ -269,7 +269,7 @@
269 269 });
270 270  
271 271 $("#qingsongkao_paper").click(function() {
272   - var path = "../paper/list2.do?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}";
  272 + var path = "../paper/list2.do?SCHOOL_ID=${pd.TEACHER.SCHOOL_ID}&SUBJECT_ID=${pd.TEACHER.SUBJECT_ID}";
273 273 //$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
274 274 if ($("#mainFrame").attr('src') != (path)) {
275 275 $("#mainFrame").attr('src', path);
... ...
resources/mybatis1/sunvote/PaperMapper.xml
  View file @41772c6
... ... @@ -257,7 +257,7 @@
257 257 <include refid="tableName"></include>
258 258 where 1 = 1
259 259 AND
260   - (SCHOOL_ID = #{SCHOOL_ID} AND PAPER_TYPE = '2') OR
  260 + (SCHOOL_ID = #{SCHOOL_ID} AND PAPER_TYPE = '2' AND SUBJECT_ID=#{SUBJECT_ID}) OR
261 261 (USER_ID = #{USER_ID} AND PAPER_TYPE = #{PAPER_TYPE})
262 262  
263 263 order by CREATE_DATE DESC
... ...
src/com/fh/controller/sunvote/paper/PaperController.java
  View file @41772c6
... ... @@ -931,6 +931,8 @@ public class PaperController extends BaseController {
931 931 testList.add(test);
932 932 stu.put("STUDENT_TOTAL", item.get("SCORE"));
933 933 stu.put("TEST_LIST", testList);
  934 + stu.put("STUDENT_NUMBER", item.get("STUDENT_NUMBER"));
  935 + stu.put("STUDENT_PADID", item.get("STUDENT_PADID"));
934 936 stu.put("TEST_NUM", testList.size() - lost_num);
935 937 stu.put("LOST_NUM", lost_num);
936 938 sid.add(item.getString("STUDENT_ID"));
... ... @@ -961,13 +963,15 @@ public class PaperController extends BaseController {
961 963 Map<String, Object> dataMap = new HashMap<String, Object>();
962 964 List<String> titles = new ArrayList<String>();
963 965 titles.add("学生姓名"); // 1
964   - titles.add("班级"); // 2
965   - titles.add("综合排名"); // 3
966   - titles.add("个人平均得分"); // 4
967   - titles.add("个人平均得分率"); // 5
  966 + titles.add("学号"); // 2
  967 + titles.add("键盘号"); // 3
  968 + titles.add("班级"); // 4
  969 + titles.add("综合排名"); // 5
  970 + //titles.add("个人平均得分"); // 4
  971 + //titles.add("个人平均得分率"); // 5
968 972 titles.add("个人得分"); // 6
969   - titles.add("测验平均分"); // 7
970   - titles.add("测验时间"); // 8
  973 + //titles.add("测验平均分"); // 7
  974 + titles.add("测验时间"); // 7
971 975  
972 976 dataMap.put("titles", titles);
973 977 List<PageData> varOList = temp;
... ... @@ -978,36 +982,23 @@ public class PaperController extends BaseController {
978 982 PageData vpd = new PageData();
979 983  
980 984 vpd.put("var1", varOList.get(i).getString("STUDENT_NAME")); // 1
981   - vpd.put("var2", varOList.get(i).getString("CLASS_NAME")); // 2
982   - vpd.put("var3", i + 1); // 3
983   - vpd.put("var4",
984   - varOList.get(i).getString("TEST_NUM").equals("0") ? 0
985   - : decimalFormat.format(Double.valueOf(varOList.get(
986   - i).getString("STUDENT_TOTAL"))
987   - / Double.valueOf(varOList.get(i).getString(
988   - "TEST_NUM")))); // 4
989   - vpd.put("var5",
990   - varOList.get(i).getString("TEST_NUM").equals("0") ? 0+"%"
991   - : decimalFormat.format((Double.valueOf(varOList
992   - .get(i).getString("STUDENT_TOTAL")) * 100 / Double
993   - .valueOf(varOList.get(i).getString(
994   - "TEST_NUM")))
995   - / Double.valueOf(pd.getString("SCORE")))+"%"); // 5
  985 + vpd.put("var2", varOList.get(i).getString("STUDENT_NUMBER")); // 2
  986 + vpd.put("var3", varOList.get(i).getString("STUDENT_PADID")); // 3
  987 + vpd.put("var4", varOList.get(i).getString("CLASS_NAME")); // 4
  988 + vpd.put("var5", i + 1); // 5
996 989 List<PageData> test_list = (List<PageData>) varOList.get(i).get(
997 990 "TEST_LIST");
998 991  
999 992 List<String> score = new ArrayList<String>();
1000   - List<String> AVG_SCORE = new ArrayList<String>();
  993 +
1001 994 List<String> CREATE_DATE = new ArrayList<String>();
1002 995 for (int x = 0; x < test_list.size(); x++) {
1003 996 score.add(test_list.get(x).getString("SCORE"));
1004   - AVG_SCORE.add(test_list.get(x).getString("AVG_SCORE"));
1005 997 CREATE_DATE.add(test_list.get(x).getString("CREATE_DATE"));
1006 998  
1007 999 }
1008 1000 vpd.put("var6", score);
1009   - vpd.put("var7", AVG_SCORE);
1010   - vpd.put("var8", CREATE_DATE);
  1001 + vpd.put("var7", CREATE_DATE);
1011 1002 varList.add(vpd);
1012 1003  
1013 1004 }
... ...