From 03a14c0e150b2580ed9fcb461121f31c46f1b39e Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Fri, 29 Jun 2018 17:16:42 +0800
Subject: [PATCH] 更新报表

---
 WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp      |  3 ---
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp   |  5 ++++-
 src/com/fh/bean/TestPaper.java                             |  9 +++++++++
 src/com/fh/controller/api/V1.java                          |  1 +
 src/com/fh/controller/sunvote/report/ReportController.java |  2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
index f13b38a..95787a9 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -34,9 +34,6 @@
 						<input type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}"/>
 						<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}"/>
 						<table style="margin-top:5px;">
-							<tr>
-								<th class="center" style="float:right"><a href="javascript:;">查看成绩报表</a></th>
-							</tr>
 						</table>
 						<!-- 检索  -->
 					
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index c089498..db86ce5 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -100,8 +100,11 @@
 						<c:when test="${not empty studentList}">
 							<c:forEach items="${studentList}" var="var" varStatus="vs">
 								<tr>
-									<td class="center"><a
+									<%-- <td class="center"><a
 										href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
+									</td> --%>
+									<td class="center"><a
+										href="report/student_report_data?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
 									</td>
 									<td class="center"><fmt:formatNumber type="number"
 											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
diff --git a/src/com/fh/bean/TestPaper.java b/src/com/fh/bean/TestPaper.java
index 504d8dd..bcde8fe 100644
--- a/src/com/fh/bean/TestPaper.java
+++ b/src/com/fh/bean/TestPaper.java
@@ -43,6 +43,7 @@ public class TestPaper {
 	// 平均分
 	private String avgScore ;
 	
+	private String totalScore;
 	// 备注
 	private String remark ;
 	
@@ -163,6 +164,14 @@ public class TestPaper {
 		this.students = students;
 	}
 
+	public String getTotalScore() {
+		return totalScore;
+	}
+
+	public void setTotalScore(String totalScore) {
+		this.totalScore = totalScore;
+	}
+
 	public static TestPaper parse(String json){
 		Gson gson = new Gson();
 		return gson.fromJson(json, TestPaper.class);
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index efae636..7da990a 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -782,6 +782,7 @@ public class V1 extends BaseController {
 				testPd.put("HIGHT_SCORE", testPaper.getHighScore());
 				testPd.put("LOW_SCORE", testPaper.getLowScore());
 				testPd.put("AVG_SCORE", testPaper.getAvgScore());
+				testPd.put("TOTAL_SCORE", testPaper.getTotalScore());
 				testPd.put("REMARK", testPaper.getRemark());
 				testpaperService.save(testPd);
 				if (testPaper.getStudents() != null) {
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 892f53a..f38a552 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -124,7 +124,7 @@ public class ReportController extends BaseController {
 		logBefore(logger, Jurisdiction.getUsername()+"学生报表数据");
 		PageData pd = getPageData();
 		ResponseGson<List<PageData>> ret = new ResponseGson();
-		pd.put("CLASS_ID", pd.get("CLASSID"));
+//		pd.put("CLASS_ID", pd.get("CLASSID"));
 		List<PageData> studentList = studentService.listAllClass(pd);
 		List<PageData> testpaperList = testpaperService.listAll(pd);
 		
--
libgit2 0.21.4