From e9e8146364ce6eb3211f24a71bf1938b8debe0e0 Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Mon, 19 Aug 2019 15:34:38 +0800
Subject: [PATCH] 1.添加金太阳id（id=7）识别

---
 WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp               |  41 +++++++++++++++++++++++++++++++++++++----
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp         |  12 +++++++++++-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp          |   1 +
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp           |   8 +++++---
 src/com/fh/controller/sunvote/homework/HomeworkController.java | 164 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 217 insertions(+), 9 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index f690275..b90255a 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -50,8 +50,8 @@
 				</div>
 				<div class="name">
 					<p>欢迎！</p>
-					<p id="school" title="${SNAME }">${SNAME }</p>
-					<p id="name" title="${SNAME } 管理员">${SNAME }管理员</p>
+					<p id="school" title="${adminInfos.SNAME }">${adminInfos.SNAME }</p>
+					<p id="name" title="${adminInfos.SNAME } 管理员">${adminInfos.SNAME }管理员</p>
 					</br>
 					</br>
 				</div>
@@ -161,7 +161,7 @@
 				<p>
 					课后练<span class="right jiao"></span>
 				</p>
-
+				
 				<ul class="menu_1">
 					<li>
 						<p onclick="event.stopPropagation();monitor('${SCHOOL_ID}')">班长管理</p>
@@ -169,10 +169,15 @@
 					<li>
 						<p id="homework_paper">作业管理</p>
 					</li>
+					<c:if test="${adminInfos.ID != 7}">
 					<li>
 						<p id="homework_analysis">作业分析</p>
 					</li>
+					</c:if>
+					
 				</ul>
+				
+				
 			</div>
 
 			<div class="analyse tab1">
@@ -380,7 +385,29 @@
 				window.top.loading.show();
 			}
 		}
-	
+		function homeWorkList(schoolId){
+			//var path = "../school/goEdit2.do?ID=" + schoolId ;
+
+			var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}' ;
+			
+				$("#mainFrame").attr('src',path);
+				window.top.loading.show();
+		}
+		function homeWork(schoolId){
+			//var path = "../school/goEdit2.do?ID=" + schoolId ;
+
+			var path = '<%=basePath%>homework/goAdd2.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
+			
+				$("#mainFrame").attr('src',path);
+				window.top.loading.show();
+		}
+		
+		function homeReport(){
+			var path = '<%=basePath%>homework/report.do?';
+			
+			$("#mainFrame").attr('src',path);
+			window.top.loading.show();
+		}
 		function chooseListClass(school_id,gradle_id){
 			var path = "../sclass/listcs.do?school_id=" + school_id + "&grade_id=" + gradle_id ;
 			$("#mainFrame").attr('src',path);
@@ -442,6 +469,12 @@
 				$("#mainFrame").attr('src', path);
 				window.top.loading.show();
 			});
+			$("#homework_analysis2").click(function() {
+				var path = "../homework/report_goldsun.do?school_id=" + schoolId;
+				//$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
+				$("#mainFrame").attr('src', path);
+				window.top.loading.show();
+			});
 
 			$("#new_paper").click(function() {
 				var path = "../paper/list5.do?school_id=" + schoolId;
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 549ee3a..482b039 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -109,7 +109,12 @@
 									<a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
 								</c:if>
 								<c:if test="${var.COMPLETE_COUNT == '1'}">
+									<c:if test="${pd.SCHOOLID ==7}">
+									<a onclick="homeReport2('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a>
+									</c:if>
+									<c:if test="${pd.SCHOOLID !=7}">
 									<a onclick="homeReport('${var.HOMEWORK_ID}');" ><img src="static/images/view.png" /></a>
+									</c:if>
 									<a onclick="del('${var.HOMEWORK_ID}');" ><img src="static/images/remove.png" /></a>
 								</c:if>
 								
@@ -201,7 +206,12 @@
 		window.top.loading.show();
 	}
 	function homeReport(homework_id){
-		var path = '<%=basePath%>homework/report2.do?HOMEWORK_ID='+homework_id;
+		var path = '<%=basePath%>homework/report.do?HOMEWORK_ID='+homework_id;
+		parent.$("#mainFrame").attr('src',path);
+		window.top.loading.show();
+	}
+	function homeReport2(homework_id){
+		var path = '<%=basePath%>homework/report2_goldsun.do?HOMEWORK_ID='+homework_id;
 		parent.$("#mainFrame").attr('src',path);
 		window.top.loading.show();
 	}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
index 7e1c463..0ffe6e8 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
@@ -210,6 +210,7 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 			window.top.loading.remove();
+			$(".table_box").css("padding-top",$(".head_box").height());
 		});
 		
 		//检索
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index cdded88..852b4ec 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -105,14 +105,16 @@
 						<p id="practice_manage"
 							onclick="event.stopPropagation();homeWorkList('${pd.TEACHER.SCHOOL_ID}')">练习列表</p>
 					</li>
-					<!-- <li>
+					<c:if test="${pd.TEACHER.SCHOOL_ID !=7 }">
+					  <li>
 						<p id="practice_do"
 							onclick="event.stopPropagation();homeWork('${pd.TEACHER.SCHOOL_ID}')">布置练习</p>
 					</li>
 					<li>
 						<p id="practice_report"
 							onclick="event.stopPropagation();homeReport()">练习报表</p>
-					</li> -->
+					</li>
+					</c:if>
 				</ul>
 			</div>
 		</div>
@@ -196,7 +198,7 @@
 		function homeWorkList(schoolId){
 			//var path = "../school/goEdit2.do?ID=" + schoolId ;
 
-			var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}' ;
+			var path = '<%=basePath%>homework/list.do?schoolId='+schoolId+'&teacher_id=${pd.TEACHER.ID}' ;
 			
 				$("#mainFrame").attr('src',path);
 				window.top.loading.show();
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 38fa012..56a05d5 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -314,6 +314,36 @@ public class HomeworkController extends BaseController {
 			
 		}
 		if(isChineseLanguageClient()){
+			modelAndView.setViewName("sunvote/homework/homework_report_bak");
+		}else{
+			modelAndView.setViewName("sunvote/homework/en_homework_report");
+		}
+		
+		return modelAndView;
+	}
+	
+	/**
+	 * 传入homework_id 
+	 * 查询该场课后练的整体情况，最高分，最低分，平均分，总分，总题数，未答人数等
+	 * 未答人数列表
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/report2_goldsun")
+	public ModelAndView report2_goldsun() throws Exception {
+		PageData pageData = this.getPageData();
+		ModelAndView modelAndView = getModelAndView();
+		
+		String homeworkId = pageData.getString("HOMEWORK_ID");
+		if(!StringUtils.isEmpty(homeworkId.trim())){
+			pageData = homeworkService.findById(pageData);
+			List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
+			pageData.put("NO_COUNT", data.size());
+			modelAndView.addObject("page_data", pageData); // 报表统计情况
+			modelAndView.addObject("data", data);// 未答学生列表
+			
+		}
+		if(isChineseLanguageClient()){
 			modelAndView.setViewName("sunvote/homework/homework_report");
 		}else{
 			modelAndView.setViewName("sunvote/homework/en_homework_report");
@@ -380,7 +410,7 @@ public class HomeworkController extends BaseController {
 	
 	
 	/**
-	 * 去修改页面
+	 * 练习报表
 	 * 
 	 * @param
 	 * @throws Exception
@@ -503,6 +533,138 @@ public class HomeworkController extends BaseController {
 		}
 		pd.remove("JSON");
 		if(isChineseLanguageClient()){
+			mv.setViewName("sunvote/homework/homework_report_bak");
+		}else{
+			mv.setViewName("sunvote/homework/en_homework_report");
+		}
+		mv.addObject("pd", pd);
+		return mv;
+	}
+	
+	/**
+	 * 练习报表
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/report_goldsun")
+	public ModelAndView report_goldsun() throws Exception {
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		if(pd.get("SCHOOL_ID") == null || "".equals(pd.get("SCHOOL_ID").toString().trim())){
+			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<PageData> list = coursemanagementService.listTeacherClass(pd);
+		for(PageData temp : list){
+			temp.remove("HEADMASTER_ID");
+			temp.remove("SCHOOL_ID");
+			temp.remove("GRADE_ID");
+			temp.remove("TEACHER_ID");
+			temp.remove("KEYBOARD_TYPE");
+			temp.remove("BASESTATION_ID");
+			temp.put("CLASS_ID", temp.get("ID"));
+			temp.remove("ID");
+		}
+		if(pd.get("CLASS_ID") == null && list.size() > 0){
+			pd.put("CLASS_ID", list.get(0).get("CLASS_ID"));
+		}
+		pd.put("CLASSES", list);
+		
+		if (pd.get("CLASS_ID") != null) {
+			// 对应班级数据
+			PageData data = new PageData();
+			List<PageData> studentList = studentService.findByClassId(pd);
+			pd.put("COMPLETE_COUNT", "1");
+			List<PageData> homeworkList = homeworkService.listAll(pd);
+			List<PageData> dataList = homeworkService.report(pd);
+			for (PageData stuPd : studentList) {
+				double all = 0;
+				double get = 0;
+				int sc = 0 ;
+				int ac = 0 ;
+				for (PageData dpd : dataList) {
+					if (stuPd.get("ID") != null && dpd.get("STUDENT_ID") != null && dpd.get("STUDENT_ID").equals(stuPd.get("ID")) && isIn(dpd.getString("HOMEWORK_ID"),homeworkList)) {
+						stuPd.put(dpd.get("HOMEWORK_ID"),
+								dpd.get("STUDENT_SCORE"));
+						try {
+							get += Double.parseDouble(dpd.get("STUDENT_SCORE")
+									.toString());
+						} catch (Exception ex) {
+
+						}
+						try {
+							all += Double.parseDouble(dpd.get("PAPER_SCORE")
+									.toString());
+						} catch (Exception ex) {
+
+						}
+						try {
+							sc += Integer.parseInt(dpd.get("COMPLETE_COUNT")
+									.toString());
+						} catch (Exception ex) {
+
+						}
+						try {
+							ac += Integer.parseInt(dpd.get("QUESTION_COUNT")
+									.toString());
+						} catch (Exception ex) {
+							
+						}
+						
+					}
+				}
+				stuPd.put("STUDENT_ALL_SCORE", get);
+				stuPd.put("PAPER_ALL_SCORE", all);
+				stuPd.put("COMPLETE_COUNT", sc);
+				stuPd.put("ALL_COUNT", ac);
+				stuPd.remove("SCHOOL_ID");
+				stuPd.remove("SEX");
+				stuPd.remove("CLASS_ID");
+				stuPd.remove("NUMBER");
+				stuPd.put("STUDENT_ID", stuPd.get("ID"));
+				stuPd.remove("ID");
+			}
+			
+			for (PageData hpd : homeworkList) {
+				hpd.remove("QUESTION_COUNT");
+				hpd.remove("COMPLETE_COUNT");
+				hpd.remove("SUBJECT_ID");
+				hpd.remove("SCHOOL_ID");
+				hpd.remove("GRADE_ID");
+				hpd.remove("SUMBIT_DATE");
+				hpd.remove("MODIFY_DATE");
+				hpd.remove("TEACHER_ID");
+				hpd.remove("CREATE_DATE");
+				hpd.remove("CLASS_ID");
+				hpd.remove("CODE");
+				hpd.remove("GET_MAX_SCORE");
+				hpd.remove("HOMEWORK_DESC");
+			}
+			data.put("HOMEWORKS", homeworkList);//
+			data.put("STUDENTS", studentList);
+			pd.put("DATA", data);
+		}else{
+			pd.put("CLASS_ID", "");
+		}
+		pd.remove("JSON");
+		if(isChineseLanguageClient()){
 			mv.setViewName("sunvote/homework/homework_report");
 		}else{
 			mv.setViewName("sunvote/homework/en_homework_report");
--
libgit2 0.21.4