diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
new file mode 100644
index 0000000..c812ddd
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp
@@ -0,0 +1,438 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
+<%
+ String path = request.getContextPath();
+ String basePath = request.getScheme() + "://"
+ + request.getServerName() + ":" + request.getServerPort()
+ + path + "/";
+%>
+
+
+
+
+
+
+${info.CLASS_NAME}成绩报表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="../../system/index/foot.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
new file mode 100644
index 0000000..c812ddd
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
@@ -0,0 +1,438 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%>
+<%
+ String path = request.getContextPath();
+ String basePath = request.getScheme() + "://"
+ + request.getServerName() + ":" + request.getServerPort()
+ + path + "/";
+%>
+
+
+
+
+
+
+${info.CLASS_NAME}成绩报表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%@ include file="../../system/index/foot.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index f2c24a1..3ce1dae 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -287,17 +287,29 @@
SELECT
sv_homeworkreport.STUDENT_ID,
- sv_homework.GET_SCORE as PAPER_SCORE,
+ sv_homeworkreport.STUDENT_NAME,
+ sv_homework.ALL_SCORE as PAPER_SCORE,
+ sv_homework.GET_SCORE as AVG_SCORE,
sv_homework.HOMEWORK_ID,
+ sv_homework.NAME,
+ sv_homework.GET_MAX_SCORE,
+ sv_homeworkreport.STUDNET_NO,
+ sv_homework.COMPLETE_DATE,
sv_homeworkreport.GET_SCORE as STUDENT_SCORE
FROM
sv_homework
LEFT JOIN sv_homeworkreport ON sv_homework.HOMEWORK_ID = sv_homeworkreport.HOMEWORK_ID
WHERE
- sv_homework.CLASS_ID = #{CLASS_ID} and sv_homework.COMPLETE_COUNT > 0
+ sv_homework.COMPLETE_COUNT > 0
+
+ and sv_homework.CLASS_ID = #{CLASS_ID}
+
and sv_homework.HOMEWORK_ID = #{HOMEWORK_ID}
+
+ and STUDENT_ID = #{STUDENT_ID}
+
and COMPLETE_DATE < #{START_DATE}
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index f15c67a..9113313 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -365,6 +365,77 @@ public class HomeworkController extends BaseController {
mv.addObject("pd", pd);
return mv;
}
+
+
+ /**
+ * 去修改页面
+ *
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value = "/student")
+ public ModelAndView student() throws Exception {
+ ModelAndView mv = this.getModelAndView();
+ PageData pd = new PageData();
+ pd = this.getPageData();
+ pd.put("TEACHER_ID", getTeacherID());
+
+
+ if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
+ pd.put("CURRENT_WEEK", "0");
+ String currentWeek = pd.getString("CURRENT_WEEK");
+ int current = Integer.parseInt(currentWeek);
+ pd.put("START_DATE", getWeekStart(current));
+ pd.put("END_DATE", getWeekEnd(current));
+ }else if(pd.get("CURRENT_WEEK") != null){
+ String currentWeek = pd.getString("CURRENT_WEEK");
+ int current = Integer.parseInt(currentWeek);
+ pd.put("START_DATE", getWeekStart(current));
+ pd.put("END_DATE", getWeekEnd(current));
+ }
+ List dataList = homeworkService.report(pd);
+ pd.put("DATA", dataList);
+ pd.remove("JSON");
+ mv.setViewName("sunvote/homework/homework_student_report");
+ mv.addObject("pd", pd);
+ return mv;
+ }
+
+
+ /**
+ * 去修改页面
+ *
+ * @param
+ * @throws Exception
+ */
+ @RequestMapping(value = "/homework_report")
+ public ModelAndView homework_report() throws Exception {
+ ModelAndView mv = this.getModelAndView();
+ PageData pd = new PageData();
+ pd = this.getPageData();
+ pd.put("TEACHER_ID", getTeacherID());
+
+
+ if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
+ pd.put("CURRENT_WEEK", "0");
+ String currentWeek = pd.getString("CURRENT_WEEK");
+ int current = Integer.parseInt(currentWeek);
+ pd.put("START_DATE", getWeekStart(current));
+ pd.put("END_DATE", getWeekEnd(current));
+ }else if(pd.get("CURRENT_WEEK") != null){
+ String currentWeek = pd.getString("CURRENT_WEEK");
+ int current = Integer.parseInt(currentWeek);
+ pd.put("START_DATE", getWeekStart(current));
+ pd.put("END_DATE", getWeekEnd(current));
+ }
+ List dataList = homeworkService.report(pd);
+ pd.put("DATA", dataList);
+ pd.remove("JSON");
+ mv.setViewName("sunvote/homework/homework_item_report");
+ mv.addObject("pd", pd);
+ return mv;
+ }
+
/**