From 001b21e2d308788f4228759fdc3ed75946650d95 Mon Sep 17 00:00:00 2001
From: jack_rabbit <376168706@qq.com>
Date: Tue, 17 Dec 2019 10:55:41 +0800
Subject: [PATCH] 1.修改年级分析报表内容

---
 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp        |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/paper/test_list3.jsp         | 20 ++++++++++++--------
 resources/mybatis1/sunvote/StudentTestMapper.xml         |  4 +++-
 src/com/fh/controller/sunvote/paper/PaperController.java |  2 ++
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
index 72cb676..e89c2a9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
@@ -107,7 +107,7 @@
 								<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?MB1=nj&paper_id=${var.PAPER_ID}">查看成绩</a>
+								<%-- <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> --%>
 								<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>
 								<a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
 								</td>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list3.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list3.jsp
index c007250..86c4381 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list3.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list3.jsp
@@ -88,12 +88,14 @@
 				<thead>
 					<tr>
 						<th><div style="width:80px;text-align:center">学生姓名</div></th>
+						<th><div style="width:80px;text-align:center">学号</div></th>
+						<th><div style="width:80px;text-align:center">键盘号</div></th>
 						<th><div style="width:80px;text-align:center">班级</div></th>
 						<th><div style="width:80px;text-align:center">综合排名</div></th>
-						<th><div style="width:100px;text-align:center">个人平均得分</div></th>
-						<th><div style="width:100px;text-align:center">个人平均得分率</div></th>
+						<!-- <th><div style="width:100px;text-align:center">个人平均得分</div></th> -->
+						<!-- <th><div style="width:100px;text-align:center">个人平均得分率</div></th> -->
 						<th><div style="width:80px;text-align:center">个人得分</div></th>
-						<th><div style="width:80px;text-align:center">测验平均分</div></th>
+						<!-- <th><div style="width:80px;text-align:center">测验平均分</div></th> -->
 						<th><div style="width:80px;text-align:center">测验时间</div></th>
 					</tr>
 				</thead>
@@ -104,20 +106,22 @@
 							<c:set var="student_avg" value="${var.TEST_NUM==0?0:var.STUDENT_TOTAL/var.TEST_NUM}"></c:set>
 							<tr>
 								<td rowspan="${var.TEST_LIST.size()}" align="center">${var.STUDENT_NAME}</td>
+								<td rowspan="${var.TEST_LIST.size()}" align="center">${var.STUDENT_NUMBER}</td>
+								<td rowspan="${var.TEST_LIST.size()}" align="center">${var.STUDENT_PADID}</td>
 								<td rowspan="${var.TEST_LIST.size()}" align="center">${var.CLASS_NAME}</td>
 								<td rowspan="${var.TEST_LIST.size()}" align="center">${vs.index+1}</td>
-								<td rowspan="${var.TEST_LIST.size()}" align="center"><fmt:formatNumber type="number"
+								<%-- <td rowspan="${var.TEST_LIST.size()}" align="center"><fmt:formatNumber type="number"
 									value="${student_avg}"
-									maxFractionDigits="2" /></td>
-								<td rowspan="${var.TEST_LIST.size()}" align="center"><fmt:formatNumber type="number"
+									maxFractionDigits="2" /></td> --%>
+								<%-- <td rowspan="${var.TEST_LIST.size()}" align="center"><fmt:formatNumber type="number"
 									value="${student_avg*100/pd.SCORE}"
-									maxFractionDigits="2" />%</td>	
+									maxFractionDigits="2" />%</td>	 --%>
 								<c:forEach items="${var.TEST_LIST }" var ="var1" varStatus="vs1">
 									<c:if test="${!vs1.first}">
 				                        <tr>
 				                    </c:if>
 									<td>${var1.SCORE } </td>
-									<td>${var1.AVG_SCORE } </td>
+									<%-- <td>${var1.AVG_SCORE } </td> --%>
 									<td>${var1.CREATE_DATE } </td>
 									</tr>
 								</c:forEach>
diff --git a/resources/mybatis1/sunvote/StudentTestMapper.xml b/resources/mybatis1/sunvote/StudentTestMapper.xml
index 611365e..9ad116d 100644
--- a/resources/mybatis1/sunvote/StudentTestMapper.xml
+++ b/resources/mybatis1/sunvote/StudentTestMapper.xml
@@ -100,7 +100,9 @@
 			sv_testpaper.CREATE_DATE,
 			sv_testpaper.`NAME` AS PAPER_NAME,
 			sv_sclass.CLASS_NAME,
-			sv_student.`NAME` as STUDENT_NAME
+			sv_student.`NAME` as STUDENT_NAME,
+			sv_student.NUMBER AS STUDENT_NUMBER,
+			sv_student.KEYPAD_ID AS STUDENT_PADID
 		from 
 			`sv_studenttest`
 			LEFT JOIN sv_testpaper ON sv_studenttest.TEST_ID = sv_testpaper.TESTPAPER_ID 
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index ce46354..0945f36 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -820,6 +820,8 @@ public class PaperController extends BaseController {
 						test.put("AVG_SCORE", item.get("AVG_SCORE"));
 						testList.add(test);
 						stu.put("STUDENT_TOTAL", item.get("SCORE"));
+						stu.put("STUDENT_NUMBER", item.get("STUDENT_NUMBER"));
+						stu.put("STUDENT_PADID", item.get("STUDENT_PADID"));
 						stu.put("TEST_LIST", testList);
 						stu.put("TEST_NUM", testList.size() - lost_num);
 						stu.put("LOST_NUM", lost_num);
--
libgit2 0.21.4