孙向锦 / SunvoteEducation

Commit 001b21e2d308788f4228759fdc3ed75946650d95

Authored by jack
1 parent d2c7acd4

1.修改年级分析报表内容

Inline Side-by-side
Showing 4 changed files with 18 additions and 10 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
  View file @001b21e
... ... @@ -107,7 +107,7 @@
107 107 <td >${var.TEST_NUM}</td>
108 108 <td >${var.SCORE}</td>
109 109 <td>
110   - <a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?MB1=nj&paper_id=${var.PAPER_ID}">查看成绩</a>
  110 + <%-- <a <c:if test="${var.TEST_NUM == 0}" >disabled style="pointer-events:none;color:#ccc" </c:if> href="<%=basePath%>paper/paperRep.do?MB1=nj&paper_id=${var.PAPER_ID}">查看成绩</a> --%>
111 111 <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>
112 112 <a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
113 113 </td>
... ...
WebRoot/WEB-INF/jsp/sunvote/paper/test_list3.jsp
  View file @001b21e
... ... @@ -88,12 +88,14 @@
88 88 <thead>
89 89 <tr>
90 90 <th><div style="width:80px;text-align:center">学生姓名</div></th>
  91 + <th><div style="width:80px;text-align:center">学号</div></th>
  92 + <th><div style="width:80px;text-align:center">键盘号</div></th>
91 93 <th><div style="width:80px;text-align:center">班级</div></th>
92 94 <th><div style="width:80px;text-align:center">综合排名</div></th>
93   - <th><div style="width:100px;text-align:center">个人平均得分</div></th>
94   - <th><div style="width:100px;text-align:center">个人平均得分率</div></th>
  95 + <!-- <th><div style="width:100px;text-align:center">个人平均得分</div></th> -->
  96 + <!-- <th><div style="width:100px;text-align:center">个人平均得分率</div></th> -->
95 97 <th><div style="width:80px;text-align:center">个人得分</div></th>
96   - <th><div style="width:80px;text-align:center">测验平均分</div></th>
  98 + <!-- <th><div style="width:80px;text-align:center">测验平均分</div></th> -->
97 99 <th><div style="width:80px;text-align:center">测验时间</div></th>
98 100 </tr>
99 101 </thead>
... ... @@ -104,20 +106,22 @@
104 106 <c:set var="student_avg" value="${var.TEST_NUM==0?0:var.STUDENT_TOTAL/var.TEST_NUM}"></c:set>
105 107 <tr>
106 108 <td rowspan="${var.TEST_LIST.size()}" align="center">${var.STUDENT_NAME}</td>
  109 + <td rowspan="${var.TEST_LIST.size()}" align="center">${var.STUDENT_NUMBER}</td>
  110 + <td rowspan="${var.TEST_LIST.size()}" align="center">${var.STUDENT_PADID}</td>
107 111 <td rowspan="${var.TEST_LIST.size()}" align="center">${var.CLASS_NAME}</td>
108 112 <td rowspan="${var.TEST_LIST.size()}" align="center">${vs.index+1}</td>
109   - <td rowspan="${var.TEST_LIST.size()}" align="center"><fmt:formatNumber type="number"
  113 + <%-- <td rowspan="${var.TEST_LIST.size()}" align="center"><fmt:formatNumber type="number"
110 114 value="${student_avg}"
111   - maxFractionDigits="2" /></td>
112   - <td rowspan="${var.TEST_LIST.size()}" align="center"><fmt:formatNumber type="number"
  115 + maxFractionDigits="2" /></td> --%>
  116 + <%-- <td rowspan="${var.TEST_LIST.size()}" align="center"><fmt:formatNumber type="number"
113 117 value="${student_avg*100/pd.SCORE}"
114   - maxFractionDigits="2" />%</td>
  118 + maxFractionDigits="2" />%</td> --%>
115 119 <c:forEach items="${var.TEST_LIST }" var ="var1" varStatus="vs1">
116 120 <c:if test="${!vs1.first}">
117 121 <tr>
118 122 </c:if>
119 123 <td>${var1.SCORE } </td>
120   - <td>${var1.AVG_SCORE } </td>
  124 + <%-- <td>${var1.AVG_SCORE } </td> --%>
121 125 <td>${var1.CREATE_DATE } </td>
122 126 </tr>
123 127 </c:forEach>
... ...
resources/mybatis1/sunvote/StudentTestMapper.xml
  View file @001b21e
... ... @@ -100,7 +100,9 @@
100 100 sv_testpaper.CREATE_DATE,
101 101 sv_testpaper.`NAME` AS PAPER_NAME,
102 102 sv_sclass.CLASS_NAME,
103   - sv_student.`NAME` as STUDENT_NAME
  103 + sv_student.`NAME` as STUDENT_NAME,
  104 + sv_student.NUMBER AS STUDENT_NUMBER,
  105 + sv_student.KEYPAD_ID AS STUDENT_PADID
104 106 from
105 107 `sv_studenttest`
106 108 LEFT JOIN sv_testpaper ON sv_studenttest.TEST_ID = sv_testpaper.TESTPAPER_ID
... ...
src/com/fh/controller/sunvote/paper/PaperController.java
  View file @001b21e
... ... @@ -820,6 +820,8 @@ public class PaperController extends BaseController {
820 820 test.put("AVG_SCORE", item.get("AVG_SCORE"));
821 821 testList.add(test);
822 822 stu.put("STUDENT_TOTAL", item.get("SCORE"));
  823 + stu.put("STUDENT_NUMBER", item.get("STUDENT_NUMBER"));
  824 + stu.put("STUDENT_PADID", item.get("STUDENT_PADID"));
823 825 stu.put("TEST_LIST", testList);
824 826 stu.put("TEST_NUM", testList.size() - lost_num);
825 827 stu.put("LOST_NUM", lost_num);
... ...