报表优化

孙向锦
1 parent 705eb8ca
Showing 12 changed files with 288 additions and 14 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
resources/mybatis1/api/V1Mapper.xml
resources/mybatis1/sunvote/TestPaperInfoMapper.xml
src/com/fh/bean/TestPaper.java
src/com/fh/controller/api/V1.java
src/com/fh/controller/sunvote/report/ReportController.java
src/com/fh/service/api/V1Manager.java
src/com/fh/service/api/impl/V1Service.java
src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java
src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java
src/com/fh/util/PageData.java
@@ -238,7 +238,7 @@
 			var subject_id =  $("#SUBJECT_ID").val();
 			url = url + "&start_date=" + startDate ;
 			if(endDate != null){
-				url = url + + "&end_date=" + endDate;
+				url = url + "&end_date=" + endDate;
 			}
 			if(subject_id != null){
 				url = url + "&SUBJECT_ID=" + subject_id;
@@ -28,7 +28,7 @@
 </style>
 </head>
-<body style="background:#fff;overflow-y:hidden;">
+<body style="background:#fff;/* overflow-y:hidden; */">
 	<div style="padding:20px 20px;">
 		<form action="report/report_test.do" method="post" name="Form" id="Form">
@@ -36,10 +36,12 @@
 			<table style="margin-top:5px;">
 				<tr style="height: 30px">
 					<td>测验名称: ${testpaperInfo.NAME}</td>  
+					<c:if test="${display}">
 					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
 					<td>教师: ${teacherPd.NAME}</td> 
 					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
 					<td>科目名称: ${subjectPd.CNAME}</td>
+					</c:if>
 				</tr>
 				<tr style="height: 30px">
 					<td>收卷时间: ${testpaperInfo.END_DATE}</td>
@@ -78,8 +80,8 @@
 						<!-- <td class="center"></td> -->
 						<td class="center"><div style="width:80px;">--</div></td>
 						<c:forEach items="${questionInfo}" var="var" varStatus="vs">
-							<td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
-									value="${var == 0 ? 0: (var / classInfo.studentNum * 100)}"
+							<td class="center"><div style="width:80px;margin:0 auto;"><c:set var="key"><c:out value="${vs.index+1}" /></c:set><fmt:formatNumber type="number"
+									value="${(questionInfo[key] / classInfo.studentNum * 100)}"
 									maxFractionDigits="1" />%</div></td>
 						</c:forEach>
 						<!-- <td class="center"></td> -->
@@ -142,7 +144,7 @@
             removeOriginal: true
         	};
-       		$("#simple-table").tablescroller(options);
+//       		$("#simple-table").tablescroller(options);
 		});
 		$(function() {
@@ -260,6 +260,47 @@
    </select>
+	<select id="classReport"  parameterType="pd" resultType="pd">
+		SELECT
+			sv_student.`NAME`,
+			sv_studenttest.STUDENT_ID,
+			sv_studenttest.TEST_ID,
+			sv_studenttest.SCORE,
+			sv_testpaper.`NAME` AS PAPER_NAME,
+			sv_testpaper.CREATE_DATE,
+			sv_testpaper.AVG_SCORE,
+			sv_testpaper.TOTAL_SCORE
+		FROM
+			sv_testpaper
+		LEFT JOIN sv_studenttest ON sv_testpaper.TESTPAPER_ID = sv_studenttest.TEST_ID
+		LEFT JOIN sv_student ON sv_student.ID = sv_studenttest.STUDENT_ID
+		WHERE
+		 sv_student.`NAME` IS NOT NULL
+		 <if test="CLASS_ID != null and CLASS_ID != ''">
+			AND	sv_testpaper.SCLASS_ID = #{CLASS_ID}
+			AND sv_student.CLASS_ID =  #{CLASS_ID}
+		</if>
+		 <if test="TEACHER_ID != null and TEACHER_ID != ''">
+			AND	sv_testpaper.TEACHER_ID = #{TEACHER_ID}
+		</if>
+		 <if test="SUBJECT_ID != null and SUBJECT_ID != ''">
+			AND	sv_testpaper.SUBJECT_ID = #{SUBJECT_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	sv_testpaper.CREATE_DATE &gt; #{START_DATE}
+		</if>
+		 <if test="END_DATE != null and END_DATE != ''">
+			AND	sv_testpaper.CREATE_DATE &lt; CONCAT(#{END_DATE},'A')
+		</if>
+		ORDER BY
+			(sv_student.NUMBER * 1),
+			sv_studenttest.STUDENT_ID,
+			sv_testpaper.CREATE_DATE
+	</select>
+	
 </mapper>
 \ No newline at end of file
@@ -263,6 +263,29 @@
 				(sv_paperquestion.RANK * 1)
 	</select>
+	<select id="reportTestPaperDetail" parameterType="pd" resultType="pd">
+		SELECT
+			sv_student.`NAME`,
+			sv_student.ID,
+			sv_student.KEYPAD_ID,
+			sv_student.NUMBER,
+			sv_testpaperinfo.STUDENT_ID,
+			sv_testpaperinfo.QUESTION_ID,
+			sv_testpaperinfo.SCORE,
+			sv_testpaperinfo.ANSWER,
+			sv_testpaperinfo.`RIGHT`,
+			sv_paperquestion.RANK
+		FROM
+			sv_testpaperinfo
+		LEFT JOIN sv_student ON sv_testpaperinfo.STUDENT_ID = sv_student.ID
+		LEFT JOIN sv_paperquestion ON sv_testpaperinfo.QUESTION_ID = sv_paperquestion.QUESTION_ID
+		WHERE
+			sv_testpaperinfo.TEST_ID = #{TEST_ID}
+		ORDER BY
+			sv_testpaperinfo.STUDENT_ID,
+			(sv_paperquestion.RANK * 1)
+	</select>
+	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
@@ -49,6 +49,8 @@ public class TestPaper {
 	private String test_type ;
+	private String subject_id ;
+	
 	private List<StudentAnswer> students = new ArrayList<StudentAnswer>();
 	public String getTestpaperId() {
@@ -187,6 +189,16 @@ public class TestPaper {
 		return gson.fromJson(json, TestPaper.class);
 	}
+	
+	
+	public String getSubject_id() {
+		return subject_id;
+	}
+
+	public void setSubject_id(String subject_id) {
+		this.subject_id = subject_id;
+	}
+
 	public String toJson(){
 		Gson gson = new Gson();
 		return gson.toJson(this);
@@ -1607,6 +1607,7 @@ public class V1 extends BaseController {
 				testPd.put("LOW_SCORE", testPaper.getLowScore());
 				testPd.put("AVG_SCORE", testPaper.getAvgScore());
 				testPd.put("TOTAL_SCORE", testPaper.getTotalScore());
+				testPd.put("SUBJECT_ID", testPaper.getSubject_id());
 				testPd.put("REMARK", testPaper.getRemark());
 				testpaperService.save(testPd);
 				if (testPaper.getStudents() != null) {
@@ -1728,6 +1729,7 @@ public class V1 extends BaseController {
 				testPd.put("LOW_SCORE", testPaper.getLowScore());
 				testPd.put("AVG_SCORE", testPaper.getAvgScore());
 				testPd.put("TOTAL_SCORE", testPaper.getTotalScore());
+				testPd.put("SUBJECT_ID", testPaper.getSubject_id());
 				testPd.put("REMARK", testPaper.getRemark());
 				testpaperService.save(testPd);
 				if (testPaper.getStudents() != null) {
@@ -20,7 +20,6 @@ import com.fh.service.sunvote.student.StudentManager;
 import com.fh.service.sunvote.studenttest.StudentTestManager;
 import com.fh.service.sunvote.subject.SubjectManager;
 import com.fh.service.sunvote.teacher.TeacherManager;
-import com.fh.service.sunvote.teacher.impl.TeacherService;
 import com.fh.service.sunvote.testpaper.TestPaperManager;
 import com.fh.service.sunvote.testpaperinfo.TestPaperInfoManager;
 import com.fh.util.Jurisdiction;
@@ -95,15 +94,113 @@ 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"));
-		List<PageData> studentList = studentService.listAllClass(pd);
-		
-		
 		// 2查询班级考试
 		pd.put("TEST_TYPE", "1");
-		List<PageData> testpaperList = testpaperService.listAll(pd);
+//		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();
+		List<PageData> studentList = new ArrayList();
+		PageData studentPd = null;
+		float totalScore = 0 ;
+		float getScore = 0 ;
+		for(PageData item : reportData){
+			
+			// 学生列表
+			if(studentPd != null && item.get("STUDENT_ID").equals(studentPd.get("STUDENT_ID"))){
+				//
+				String score = item.getString("SCORE");
+				if(!"0".equals(score)){
+					studentPd.put(item.get("TEST_ID"), item.get("SCORE"));
+				}else{
+					studentPd.put(item.get("TEST_ID"), "--");
+				}
+				String totalScoreStr = item.getString("TOTAL_SCORE");
+				if(totalScoreStr != null){
+					try{
+						totalScore +=Float.parseFloat(totalScoreStr);
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+				if(score != null){
+					try{
+						getScore += Float.parseFloat(score);
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+			}else{
+				if(studentPd != null){
+					studentPd.put("TOTALSCORE", totalScore);
+					studentPd.put("GETSCORE", getScore);
+					studentList.add(studentPd);
+					totalScore = 0 ;
+					getScore = 0 ;
+				}
+				studentPd = new PageData();
+				studentPd.put("STUDENT_ID", item.get("STUDENT_ID"));
+				studentPd.put("NAME", item.get("NAME"));
+				String score = item.getString("SCORE");
+				if(!"0".equals(score)){
+					studentPd.put(item.get("TEST_ID"), item.get("SCORE"));
+				}else{
+					studentPd.put(item.get("TEST_ID"), "--");
+				}
+				String totalScoreStr = item.getString("TOTAL_SCORE");
+				if(totalScoreStr != null){
+					try{
+						totalScore += Float.parseFloat(totalScoreStr);
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+				if(score != null){
+					try{
+						getScore += Float.parseFloat(score);
+					}catch(Exception ex){
+						logger.info(ex);
+					}
+				}
+				
+			}
+			PageData clone = new PageData(item);
+			// 试卷列表
+			if(!contain(testpaperList, clone, "TEST_ID")){
+				clone.put("TESTPAPER_ID", clone.get("TEST_ID"));
+				clone.put("NAME", clone.get("PAPER_NAME"));
+				testpaperList.add(clone);
+			}
+			
+		}
+		if(studentPd != null){
+			studentPd.put("TOTALSCORE", totalScore);
+			studentPd.put("GETSCORE", getScore);
+			studentList.add(studentPd);
+			totalScore = 0 ;
+			getScore = 0 ;
+		}
+		
+		Collections.sort(testpaperList,new Comparator<PageData>(){
+
+			@Override
+			public int compare(PageData o1, PageData o2) {
+				String o1GetScore = o1.getString("CREATE_DATE");
+				String o2GetScore = o2.getString("CREATE_DATE");
+				return - o1GetScore.compareToIgnoreCase(o2GetScore);
+			}
+			
+		});
+		
 		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){
@@ -141,7 +238,7 @@ public class ReportController extends BaseController {
 				studentPageData.put("GETSCORE", getScore);
 			}
-		}
+		}*/
 		// 课程平均得分率
 		// 课程总分
 		mv.addObject("studentList", studentList);
@@ -154,6 +251,15 @@ public class ReportController extends BaseController {
 		return mv;
 	}
+	private boolean contain(List<PageData> source, PageData aim,String key){
+		for(PageData tp : source){
+			if(tp.get(key) != null && tp.get(key).equals(aim.get(key))){
+				return true;
+			}
+		}
+		return false;
+	}
+	
 	@RequestMapping(value="/teacher_report")
 	public ModelAndView teacher_report() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"教师报表");
@@ -305,9 +411,70 @@ public class ReportController extends BaseController {
 		subjectPd.put("ID", testpaperPd.get("SUBJECT_ID"));
 		subjectPd = subjectService.findById(subjectPd);
+		pd.put("TEST_ID", pd.get("TESTID"));
+		List<PageData> detail = testpaperinfoService.reportTestPaperDetail(pd);
+		List<PageData> studentList = new ArrayList();
+//		List<Integer> questionList = new ArrayList<Integer>();
+		PageData questionList = new PageData();
+		List<PageData> tqList = new ArrayList<PageData>();
+		PageData tmp = null;
+		float getScore = 0 ;
+		for(PageData tpd : detail){
+			if(tmp != null && tpd.get("ID").equals(tmp.get("ID"))){
+				try{
+					getScore += Float.parseFloat(tpd.getString("SCORE"));
+				}catch(Exception ex){};
+				tqList.add(tpd);
+				if(questionList.get(tpd.get("RANK")) != null){
+					if("1".equals(tpd.get("RIGHT"))){
+						Integer num = (Integer)questionList.get(tpd.get("RANK"));
+						questionList.put(tpd.get("RANK"), num+1);
+					}
+				}else{
+					if("1".equals(tpd.get("RIGHT"))){
+						questionList.put(tpd.get("RANK"), 1);
+					}else{
+						questionList.put(tpd.get("RANK"), 0);
+					}
+				}
+			}else{
+				if(tmp != null){
+					tmp.put("GETSCORE", getScore);
+					studentList.add(tmp);
+				}
+				getScore = 0 ;
+				tmp = new PageData();
+				tqList = new ArrayList<PageData>();
+				tmp.put("NAME", tpd.get("NAME"));
+				tmp.put("KEYPAD_ID", tpd.get("KEYPAD_ID"));
+				tmp.put("NUMBER", tpd.get("NUMBER"));
+				tmp.put("ID", tpd.get("ID"));
+				tqList.add(tpd);
+				tmp.put("detail", tqList);
+				try{
+					getScore += Float.parseFloat(tpd.getString("SCORE"));
+				}catch(Exception ex){};
+				if(questionList.get(tpd.get("RANK")) != null){
+					if("1".equals(tpd.get("RIGHT"))){
+						Integer num = (Integer)questionList.get(tpd.get("RANK"));
+						questionList.put(tpd.get("RANK"), num+1);
+					}
+				}else{
+					if("1".equals(tpd.get("RIGHT"))){
+						questionList.put(tpd.get("RANK"), 1);
+					}else{
+						questionList.put(tpd.get("RANK"), 0);
+					}
+				}
+			}
+		}
+		if(tmp != null){
+			tmp.put("GETSCORE", getScore);
+			studentList.add(tmp);
+		}
-		// 查询班级学生
+		/*// 查询班级学生
 		List<PageData> studentList = studentService.listAllClass(pd);
 		List<Integer> questionList = new ArrayList<Integer>();
 		for(PageData studentPd : studentList){
@@ -338,7 +505,7 @@ public class ReportController extends BaseController {
 			}
 			studentPd.put("GETSCORE", score);
-		}
+		}*/
 		Collections.sort(studentList,new Comparator<PageData>(){
@@ -363,7 +530,7 @@ public class ReportController extends BaseController {
 					String n1 =  o1.getString("NUMBER");
 					String n2 =  o2.getString("NUMBER");
 					if(n1 != null && n2 != null){
-						return n1.compareToIgnoreCase(n2);
+						return Integer.parseInt(n1) - Integer.parseInt(n2);
 					}
 				}
 				return  o2score - o1score > 0 ? 1 : -1;
@@ -399,6 +566,13 @@ public class ReportController extends BaseController {
 		}
 		classPageData.put("studentNum", studentList.size());
+		
+		if("teacher".equals(getRole())){
+			mv.addObject("display", false);
+		}else{
+			mv.addObject("display", true);
+		}
+		
 		mv.addObject("classInfo", classPageData);
 		mv.addObject("testpaperInfo", testpaperPd);
 		mv.addObject("questionInfo", questionList);
@@ -25,4 +25,6 @@ public interface V1Manager {
 	public List<PageData> getAdminInfo(PageData pd) throws Exception;
 	public List<PageData> getClassBySchoolAndGradle(PageData pd) throws Exception;
+	
+	public List<PageData> classReport(PageData pd)	throws Exception;
 }
@@ -66,5 +66,11 @@ public class V1Service implements V1Manager {
 			throws Exception {
 		return (List<PageData>)dao.findForList("V1Mapper.getClassBySchoolAndGradle", pd);
 	}
+	
+	@Override
+	public List<PageData> classReport(PageData pd)
+			throws Exception {
+		return (List<PageData>)dao.findForList("V1Mapper.classReport", pd);
+	}
 }
@@ -54,6 +54,9 @@ public interface TestPaperInfoManager{
 	 */
 	public List<PageData> reportPaperDetail(PageData pd)throws Exception;
+	
+	public List<PageData> reportTestPaperDetail(PageData pd)throws Exception;
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
@@ -93,6 +93,11 @@ public class TestPaperInfoService implements TestPaperInfoManager{
 		return (List<PageData>)dao.findForList("TestPaperInfoMapper.reportPaperDetail", pd);
 	}
+	@SuppressWarnings("unchecked")
+	public List<PageData> reportTestPaperDetail(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("TestPaperInfoMapper.reportTestPaperDetail", pd);
+	}
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
@@ -167,4 +167,8 @@ public class PageData extends HashMap implements Map{
 		return map.values();
 	}
+	
+	public PageData(PageData tp){
+		this.map = new HashMap(tp.map);
+	}
 }