From f4117436ef6d336b3b77cda4a0ae3aacbc2c4dac Mon Sep 17 00:00:00 2001
From: jack-rabbit <376168706@qq.com>
Date: Wed, 21 Aug 2019 17:32:41 +0800
Subject: [PATCH] 1.bug修复

---
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_report_bak.jsp     | 19 ++++++++++---------
 WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp             |  2 +-
 WebRoot/static/js/home_control1.js                               | 10 ++++++----
 src/com/fh/controller/sunvote/homework/HomeworkController.java   |  2 +-
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report_bak.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report_bak.jsp
index 12618b9..aa0014c 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report_bak.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report_bak.jsp
@@ -103,7 +103,7 @@
 						<th class="center th_name"><div style="width:150px;">姓名</div></th>
 						<th class="center "><div style="width:150px;">课程平均得分率</div></th>
 						<th class="center"><div style="width:80px;">课程总分</div></th>
-						<th class="center"><div style="width:150px;">个人完成情况</div></th>
+						<!-- <th class="center"><div style="width:150px;">个人完成情况</div></th> -->
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
 							<th class="center kc"><a
 								 onclick="paper('${pd.CLASS_ID}','${var_h.HOMEWORK_ID}');"><div style="width:180px;     margin: 0 auto;cursor:hand" class="font">${var_h.NAME}</br><span>${var_h.COMPLETE_DATE}</span></div></a></th>
@@ -115,7 +115,7 @@
 						<td class="center"><div style="width:150px;">班级课程总分</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
-						<td class="center"><div style="width:80px;"></div></td>
+						<!-- <td class="center"><div style="width:80px;"></div></td> -->
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
 							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.ALL_SCORE}</div></td>
 						</c:forEach>
@@ -124,25 +124,26 @@
 						<td class="center"><div style="width:150px;">班级课程平均分</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
-						<td class="center"><div style="width:80px;"></div></td>
+						<!-- <td class="center"><div style="width:80px;"></div></td> -->
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
-							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE}</div></td>
+							<td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number" value="${var_h.GET_SCORE}" pattern="#.00"/>%</div></td>
 						</c:forEach>
 					</tr>
 					<tr>
 						<td class="center"><div style="width:150px;">班级课程平均得分率</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
-						<td class="center"><div style="width:80px;"></div></td>
+						<!-- <td class="center"><div style="width:80px;"></div></td> -->
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
-							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.GET_SCORE_PERSENT }</div></td>
+							
+							<td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number" value="${fn:replace(var_h.GET_SCORE_PERSENT, '%', '')}" pattern="#.00"/>%</div></td>
 						</c:forEach>
 					</tr>
 					<tr>
 						<td class="center"><div style="width:150px;">练习完成情况</div></td>
 						<td class="center"><div style="width:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
-						<td class="center"><div style="width:80px;"></div></td>
+						<!-- <td class="center"><div style="width:80px;"></div></td> -->
 						<c:forEach items="${pd.DATA.HOMEWORKS}" var="var_h" varStatus="vs">
 							<td class="center"><div style="width:80px;margin:0 auto;">${var_h.COMPLETE_DESC }</div></td>
 						</c:forEach>
@@ -162,9 +163,9 @@
 											value="${var.PAPER_ALL_SCORE == 0 ? 0: (var.STUDENT_ALL_SCORE / var.PAPER_ALL_SCORE * 100)}"
 											maxFractionDigits="2" />%</div></td>
 									<td class="center"><div style="width:80px;margin:0 auto;">${var.PAPER_ALL_SCORE}</div></td>
-									<td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
+									<!-- <td class="center"><div style="width:80px;margin:0 auto;"><fmt:formatNumber type="number"
 											value="${var.ALL_COUNT == 0 ? 0: (var.COMPLETE_COUNT / var.ALL_COUNT * 100)}"
-											maxFractionDigits="2" />%</div></td>
+											maxFractionDigits="2" />%</div></td> -->
 									<c:forEach items="${pd.DATA.HOMEWORKS}" var="var1" varStatus="vs1">
 										<td class="center"><div style="width:80px;margin:0 auto;"><c:set var="TEST_ID"
 												value="${var1.HOMEWORK_ID}" /> ${var[TEST_ID] }</div></td>
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 b37f4ee..608e1d6 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_student_report.jsp
@@ -118,7 +118,7 @@ li {
 		var URL = '<%=basePath%>${URL}';
 		var data = ${data};
 	</script>
-	<script src="../static/js/home_control1.js?a=3"></script>
+	<script src="../static/js/home_control1.js?a=4"></script>
 	<!-- 日期框 -->
 	<script>	
 	//lay('#version').html('-v'+ laydate.v);
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 852b4ec..5fe599d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -105,7 +105,7 @@
 						<p id="practice_manage"
 							onclick="event.stopPropagation();homeWorkList('${pd.TEACHER.SCHOOL_ID}')">练习列表</p>
 					</li>
-					<c:if test="${pd.TEACHER.SCHOOL_ID !=7 }">
+					<c:if test="${pd.TEACHER.SCHOOL_ID !='7' }">
 					  <li>
 						<p id="practice_do"
 							onclick="event.stopPropagation();homeWork('${pd.TEACHER.SCHOOL_ID}')">布置练习</p>
diff --git a/WebRoot/static/js/home_control1.js b/WebRoot/static/js/home_control1.js
index f8b7e80..e16e0f6 100644
--- a/WebRoot/static/js/home_control1.js
+++ b/WebRoot/static/js/home_control1.js
@@ -22,12 +22,13 @@
 				console.log(data.DATA.length);
 				for(var j=0;j<data.DATA.length;j++){
 					home_all_score+=parseInt(data.DATA[j].PAPER_SCORE);
-					home_avg_score+=parseInt(data.DATA[j].AVG_SCORE);
-					home_max_score+=parseInt(data.DATA[j].GET_MAX_SCORE);
+					home_avg_score+=typeof(data.DATA[j].AVG_SCORE)=="undefined"?0:parseInt(data.DATA[j].AVG_SCORE);
+					home_max_score+=typeof(data.DATA[j].GET_MAX_SCORE)=="undefined"?0:parseInt(data.DATA[j].GET_MAX_SCORE);
 					home_get_score+=parseInt(data.DATA[j].STUDENT_SCORE);
 					
 				}
 				
+				
 				$(".content_l ul").html(_html);
 				
 				dataMethod(_index,data_temp);
@@ -94,8 +95,9 @@
 		var GETSCORE = parseFloat(home_get_score);
 		var TOTALSCORE = parseFloat(home_all_score);
 		var ratio=(GETSCORE/TOTALSCORE*100).toFixed(2);
-		var class_avg= (home_avg_score/ home_all_score*100).toFixed(2);
-		var class_max=(home_max_score/ home_all_score*100).toFixed(2);
+		
+		var class_avg= (home_avg_score*100/ home_all_score).toFixed(2);
+		var class_max=(home_max_score*100/ home_all_score).toFixed(2);
 		
 		var test_num=data.DATA.length;
 		var part_num=test_num;
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 56a05d5..3fcd6cf 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -277,7 +277,7 @@ public class HomeworkController extends BaseController {
 		ca.set(Calendar.DAY_OF_WEEK, a); // Sunday  
 		ca.add(Calendar.DATE, cur * 7);
 		String weekEnd = format.format(ca.getTime());  
-		return weekEnd;
+		return weekEnd + " 00:00:00";
 	}
 	
 	public static String getWeekEnd(int cur){
--
libgit2 0.21.4