From e9f47f909e29b1ed90a04a0d34523f36011bdf53 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Wed, 28 Nov 2018 16:00:15 +0800
Subject: [PATCH] 优化个人成绩报表

---
 WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp              |   2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp            |   2 +-
 WebRoot/static/js/control1.js                                       |   8 ++++----
 resources/mybatis1/sunvote/StudentTestMapper.xml                    |  41 +++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/sunvote/report/ReportController.java          | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------
 src/com/fh/service/sunvote/studenttest/StudentTestManager.java      |   4 ++++
 src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java |   5 +++++
 7 files changed, 116 insertions(+), 112 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
index 370eac6..06b8f57 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/stduent_report.jsp
@@ -117,7 +117,7 @@ li {
 	<script type="">
 		var URL = '<%=basePath%>${URL}';
 	</script>
-	<script src="../static/js/control1.js?a=4"></script>
+	<script src="../static/js/control1.js?a=1"></script>
 	<!-- 日期框 -->
 	<script>
 	//lay('#version').html('-v'+ laydate.v);
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 ed30f01..808227c 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -118,7 +118,7 @@
 										href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
 									</td> --%>
 									<td class="center"><div style="width:150px;cursor:hand"><a
-										 onclick="student('${info.CLASS_ID}','${var.ID}')">${var.NAME}</a></div>
+										 onclick="student('${info.CLASS_ID}','${var.STUDENT_ID}')">${var.NAME}</a></div>
 									</td>
 									<td class="center"><div style="width:150px;"><fmt:formatNumber type="number"
 											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
diff --git a/WebRoot/static/js/control1.js b/WebRoot/static/js/control1.js
index 11ad9e2..8f83d94 100644
--- a/WebRoot/static/js/control1.js
+++ b/WebRoot/static/js/control1.js
@@ -96,11 +96,11 @@
 	function dataMethod(index,data){
 		console.log(data);
 		//data0=[];data1=[];data2=[];data3=[];
-		var GETSCORE = parseInt(data.data.studentList[index].GETSCORE);
-		var TOTALSCORE = parseInt(data.data.TOTAL_SCORE);
+		var GETSCORE = parseFloat(data.data.studentList[index].GETSCORE);
+		var TOTALSCORE = parseFloat(data.data.TOTAL_SCORE);
 		var ratio=(GETSCORE/TOTALSCORE*100).toFixed(2);
-		var class_avg= (parseInt(data.data.AVG_SCORE)/ parseInt(data.data.TOTAL_SCORE)*100).toFixed(2);
-		var class_max=(parseInt(data.data.MAX_SCORE)/ parseInt(data.data.TOTAL_SCORE)*100).toFixed(2);
+		var class_avg= (parseFloat(data.data.AVG_SCORE)/ parseFloat(data.data.TOTAL_SCORE)*100).toFixed(2);
+		var class_max=(parseFloat(data.data.MAX_SCORE)/ parseFloat(data.data.TOTAL_SCORE)*100).toFixed(2);
 		
 		var test_num=data.data.studentList[index].testList.length;
 		var part_num=test_num;
diff --git a/resources/mybatis1/sunvote/StudentTestMapper.xml b/resources/mybatis1/sunvote/StudentTestMapper.xml
index 4ef4e44..39f31c0 100644
--- a/resources/mybatis1/sunvote/StudentTestMapper.xml
+++ b/resources/mybatis1/sunvote/StudentTestMapper.xml
@@ -164,6 +164,47 @@
 		
 	</select>
 	
+	
+	<select id="reportClassListData" parameterType="pd" resultType="pd">
+		SELECT
+			sv_student.ID,
+			sv_student.`NAME` AS NAME,
+			sv_testpaper.`NAME` AS TNAME,
+			sv_studenttest.SCORE AS SCORE,
+			sv_testpaper.TOTAL_SCORE AS TOTAL_SCORE,
+			sv_testpaper.CREATE_DATE,
+			sv_testpaper.AVG_SCORE AS AVG_SCORE,
+			sv_testpaper.HIGHT_SCORE AS MAX_SCORE
+		FROM
+			sv_student
+		LEFT JOIN sv_studenttest ON sv_student.ID = sv_studenttest.STUDENT_ID
+		LEFT JOIN sv_testpaper ON sv_testpaper.TESTPAPER_ID = sv_studenttest.TEST_ID
+		WHERE 1 = 1
+		<if test="CLASS_ID != null and CLASS_ID != ''">
+			AND	sv_student.CLASS_ID = #{CLASS_ID}
+			AND sv_testpaper.SCLASS_ID = #{CLASS_ID}
+		</if>
+		AND sv_testpaper.`NAME` IS NOT NULL
+		<if test="TEACHER_ID != null and TEACHER_ID != ''">
+			and sv_testpaper.TEACHER_ID = #{TEACHER_ID}
+		</if>
+		<if test="TEST_TYPE != null and TEST_TYPE != ''">
+			and sv_testpaper.TEST_TYPE = #{TEST_TYPE}
+		</if>
+		<if test="START_DATE != null and START_DATE != ''"><!-- 关键词检索 -->
+			and (CREATE_DATE &gt; #{START_DATE})
+		</if>
+		<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
+			and (CREATE_DATE &lt; #{END_DATE})
+		</if>
+		<if test="SUBJECT_ID != null and SUBJECT_ID != ''"><!-- 关键词检索 -->
+			and (sv_testpaper.SUBJECT_ID = #{SUBJECT_ID})
+		</if>
+		ORDER BY
+			sv_student.NUMBER,
+			sv_testpaper.CREATE_DATE
+	</select>
+	
 		<select id="reportListDataCalc"  parameterType="pd" resultType="pd">
 	
 		SELECT
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index b7a23e6..2886129 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -94,13 +94,8 @@ public class ReportController extends BaseController {
 		info.put("CLASS_CODE", classPageData.getString("CLASS_CODE"));
 		info.put("CLASS_ID", classPageData.getString("ID"));
 		pd.put("CLASS_ID", pd.get("CLASSID"));
-		
 		// 2查询班级考试
 		pd.put("TEST_TYPE", "1");
-//		List<PageData> testpaperList = testpaperService.listAll(pd);
-//		mv.addObject("testpaperList", testpaperList);
-//		info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
-		
 		// modify 根據班級查詢班級報表
 		List<PageData> reportData = v1Service.classReport(pd);
 		List<PageData> testpaperList = new ArrayList();
@@ -199,48 +194,6 @@ public class ReportController extends BaseController {
 		mv.addObject("testpaperList", testpaperList);
 		info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
 		
-	/*	
-		List<PageData> studentList = studentService.listAllClass(pd);
-		// 查询学生名单及人数
-		if(studentList != null && studentList.size() > 0){
-			for(PageData studentPageData : studentList){
-				studentPageData.put("STUDENT_ID", studentPageData.getString("ID"));
-				List<PageData> studentTestList = studenttestService.listAll(studentPageData);
-				for(PageData studentTestPageData :studentTestList){
-					String score = studentTestPageData.getString("SCORE");
-					if(!"0".equals(score)){
-						studentPageData.put(studentTestPageData.getString("TEST_ID"), studentTestPageData.getString("SCORE"));
-					}else{
-						studentPageData.put(studentTestPageData.getString("TEST_ID"), "--");
-					}
-				}
-				int totalScore = 0 ;
-				int getScore = 0 ;
-				for(PageData testPaperPageData:testpaperList){
-					String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
-					if(totalScoreStr != null){
-						try{
-							totalScore += Integer.parseInt(totalScoreStr);
-						}catch(Exception ex){
-							logger.info(ex);
-						}
-					}
-					String getScoreStr = studentPageData.getString(testPaperPageData.getString("TESTPAPER_ID"));
-					if(getScoreStr != null){
-						try{
-							getScore += Integer.parseInt(getScoreStr);
-						}catch(Exception ex){
-							logger.info(ex);
-						}
-					}
-				}
-				studentPageData.put("TOTALSCORE", totalScore);
-				studentPageData.put("GETSCORE", getScore);
-				
-			}
-		}*/
-		// 课程平均得分率
-		// 课程总分
 		mv.addObject("studentList", studentList);
 		info.put("STUDENT_NUM", studentList != null ? studentList.size() : 0);
 		mv.addObject("info", info);
@@ -294,17 +247,72 @@ public class ReportController extends BaseController {
 		logBefore(logger, Jurisdiction.getUsername()+"学生报表数据");
 		PageData pd = getPageData();
 		ResponseGson<PageData> ret = new ResponseGson();
-//		pd.put("CLASS_ID", pd.get("CLASSID"));
-		List<PageData> studentList = studentService.listAllClass(pd);
 		if ("teacher".equals(getRole())) {
 			pd.put("TEACHER_ID", getUserID());
 		}
-		List<PageData> testpaperList = testpaperService.listAll(pd);
+		pd.put("TEST_TYPE", "1");
+		List<PageData> dataList = studenttestService.reportClassListData(pd);
+		List<PageData> studentList = new ArrayList();
+		List<PageData> studentTestList = new ArrayList();
+		PageData studentPd = null;
+		float getScore = 0f ;
+		float allGetScore = 0;
+		float maxScore = 0 ;
+		for(PageData tmp : dataList){
+			if(studentPd != null && tmp.get("ID").equals(studentPd.get("ID"))){
+				String getScoreStr = tmp.getString("SCORE");
+				float score = 0 ;
+				if(getScoreStr != null){
+					try{
+						score = Float.parseFloat(getScoreStr);
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+				getScore += score;
+				allGetScore += score;
+				tmp.put("NAME", tmp.get("TNAME"));
+				studentTestList.add(tmp);
+			}else{
+				if(studentPd != null){
+					if(getScore > maxScore){
+						maxScore = getScore ;
+					}
+					studentPd.put("GETSCORE", getScore);
+					studentPd.put("testList", studentTestList);
+					studentList.add(studentPd);
+				}
+				studentPd = new PageData();
+				studentTestList = new ArrayList();
+				getScore = 0 ;
+				String getScoreStr = tmp.getString("SCORE");
+				float score = 0 ;
+				if(getScoreStr != null){
+					try{
+						score = Float.parseFloat(getScoreStr);
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+				getScore += score;
+				allGetScore += score;
+				studentPd.put("NAME", tmp.get("NAME"));
+				studentPd.put("ID", tmp.get("ID"));
+				tmp.put("NAME", tmp.get("TNAME"));
+				studentTestList.add(tmp);
+				
+			}
+		}
+		if(studentPd != null){
+			studentPd.put("GETSCORE", getScore);
+			studentPd.put("testList", studentTestList);
+			studentList.add(studentPd);
+		}
 		pd.put("ID", pd.get("CLASS_ID"));
 		PageData classPageData = sclassService.findById(pd);
 		float totalScore = 0 ;
 		float avgScore = 0;
-		for(PageData testPaperPageData:testpaperList){
+		for(PageData testPaperPageData:studentTestList){
 			String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
 			if(totalScoreStr != null){
 				try{
@@ -323,61 +331,7 @@ public class ReportController extends BaseController {
 			}
 			
 		}
-		float allGetScore = 0;
-		float maxScore = 0 ;
-		// 查询学生名单及人数
-		if(studentList != null && studentList.size() > 0){
-			for(PageData studentPageData : studentList){
-				PageData search = new PageData();
-				search.put("STUDENT_ID", studentPageData.getString("ID"));
-				if(pd.containsKey("START_DATE")){
-					search.put("START_DATE", pd.getString("START_DATE"));
-				}
-				if(pd.containsKey("END_DATE")){
-					search.put("END_DATE", pd.getString("END_DATE"));
-				}
-				if("teacher".equals(getRole())){
-					search.put("TEACHER_ID", getUserID());
-				}
-				if(pd.containsKey("SUBJECT_ID")){
-					search.put("SUBJECT_ID", pd.getString("SUBJECT_ID"));
-				}
-				List<PageData> studentTestList = studenttestService.reportListData(search);
-				studentPageData.put("testList", studentTestList);
-				
-				float getScore = 0 ;
-				for(PageData studentTestPageData:studentTestList){
-					String getScoreStr = studentTestPageData.getString("SCORE");
-					if(getScoreStr != null){
-						try{
-							getScore += Float.parseFloat(getScoreStr);
-						}catch(Exception ex){
-							logger.info(ex);
-						}
-					}
-					
-					studentTestPageData.getString("TEST_ID");
-					
-				}
-//				studentPageData.put("TOTALSCORE", totalScore);
-				studentPageData.put("GETSCORE", getScore);
-				studentPageData.remove("GROUPID");
-				studentPageData.remove("REMARK");
-				studentPageData.remove("PARENT_PHONE");
-				studentPageData.remove("PARENT_NAME");
-				studentPageData.remove("NUMBER");
-				studentPageData.remove("SIGN_NO");
-				studentPageData.remove("KEYPAD_ID");
-				studentPageData.remove("SNO");
-				studentPageData.remove("SEX");
-				
-				allGetScore += getScore;
-				if(getScore > maxScore){
-					maxScore = getScore ;
-				}
-				
-			}
-		}
+		
 		classPageData.remove("SCHOOL_ID");
 		classPageData.remove("GRADE_ID");
 		classPageData.remove("BASESTATION_ID");
diff --git a/src/com/fh/service/sunvote/studenttest/StudentTestManager.java b/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
index 384a3c0..e53913d 100644
--- a/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
+++ b/src/com/fh/service/sunvote/studenttest/StudentTestManager.java
@@ -1,6 +1,7 @@
 package com.fh.service.sunvote.studenttest;
 
 import java.util.List;
+
 import com.fh.entity.Page;
 import com.fh.util.PageData;
 
@@ -59,5 +60,8 @@ public interface StudentTestManager{
 	 */
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
 	
+	
+	public List<PageData> reportClassListData(PageData pd) throws Exception;
+	
 }
 
diff --git a/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java b/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
index 70de7ad..d4e6fdf 100644
--- a/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
+++ b/src/com/fh/service/sunvote/studenttest/impl/StudentTestService.java
@@ -86,5 +86,10 @@ public class StudentTestService implements StudentTestManager{
 		return (List<PageData>)dao.findForList("StudentTestMapper.reportListData", pd);
 	}
 	
+	@Override
+	public List<PageData> reportClassListData(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("StudentTestMapper.reportClassListData", pd);
+	}
+	
 }
 
--
libgit2 0.21.4