From 6a210cdd7f54c084893dd89bf9afd029e261b424 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Wed, 10 Apr 2019 15:16:34 +0800
Subject: [PATCH] 添加数据

---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp |  4 +++-
 src/com/fh/controller/sunvote/homework/HomeworkController.java   | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
index 353da23..36d63f7 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
@@ -119,13 +119,15 @@ li {
 	</script>
 	<script src="../static/js/control1.js?a=1"></script>
 	<!-- 日期框 -->
-	<script>
+	<script>	
 	//lay('#version').html('-v'+ laydate.v);
 	//日期范围
 	// laydate.render({
 	//  elem: '#test6'
 	//  ,range: true
 	// });
+	
+	var data = ${data};
 		$(document).ready(function(){
 			window.top.loading.remove();
 		});
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 0fd2bac..f7eb3c2 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -392,21 +392,61 @@ public class HomeworkController extends BaseController {
 			pd.put("START_DATE", getWeekStart(current));
 			pd.put("END_DATE", getWeekEnd(current));
 		}
-		
-		if(pd.get("STUDENT_ID") != null){
-			List<PageData> dataList = homeworkService.report(pd);
-			pd.put("DATA", dataList);
-		}
+		String studentId = pd.getString("STUDENT_ID") ;
+		pd.remove("STUDENT_ID");
+		List<PageData> dataList = homeworkService.report(pd);
+		pd.put("DATA", dataList);
 		if(pd.get("CLASS_ID") != null){
 			List<PageData> studentList = studentService.findByClassId(pd);
 			pd.put("STUDENTS", studentList);
 		}
 		pd.remove("JSON");
+		pd.put("STUDENT_ID", studentId);
 		mv.setViewName("sunvote/homework/homework_student_report");
 		mv.addObject("pd", pd);
+		Gson gson = new Gson();
+		mv.addObject("data",gson.toJson(pd));
 		return mv;
 	}
 	
+	/**
+	 * 去修改页面
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/student_data", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String studentData() throws Exception {
+		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));
+		}
+		String studentId = pd.getString("STUDENT_ID") ;
+		pd.remove("STUDENT_ID");
+		List<PageData> dataList = homeworkService.report(pd);
+		pd.put("DATA", dataList);
+		if(pd.get("CLASS_ID") != null){
+			List<PageData> studentList = studentService.findByClassId(pd);
+			pd.put("STUDENTS", studentList);
+		}
+		pd.remove("JSON");
+		pd.put("STUDENT_ID", studentId);
+		Gson gson = new Gson();
+		return gson.toJson(pd);
+	}
+	
 	
 	/**
 	 * 去修改页面
@@ -447,6 +487,41 @@ public class HomeworkController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	
+	
+	@RequestMapping(value = "/homework_report_data" , produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String homeworkReportData() 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));
+		}
+		if(pd.get("HOMEWORK_ID") != null){
+			List<PageData> dataList = homeworkService.report(pd);
+			pd.put("DATA", dataList);
+		}
+		if(pd.get("CLASS_ID") != null){
+			List<PageData> studentList = studentService.findByClassId(pd);
+			pd.put("STUDENTS", studentList);
+		}
+		
+		pd.remove("JSON");
+		Gson gson = new Gson();
+		return gson.toJson(pd);
+	}
 
 
 
--
libgit2 0.21.4