From c33910d6f239da5a0bd4fbe89025924c941ad022 Mon Sep 17 00:00:00 2001
From: jack_rabbit <376168706@qq.com>
Date: Thu, 12 Dec 2019 19:50:40 +0800
Subject: [PATCH] 1.bug修复

---
 WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp            | 10 +++++-----
 WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp            | 16 ++++++++--------
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp        |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp    | 14 ++++++++------
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp |  2 +-
 WebRoot/static/css/teach.css                                |  8 +++++++-
 src/com/fh/controller/sunvote/paper/PaperController.java    |  2 ++
 src/com/fh/controller/sunvote/report/ReportController.java  |  9 +++++++--
 8 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
index 7bd7492..0690f37 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
@@ -68,16 +68,16 @@
 						<th><div style="width:80px">序号</div></th>
 						<th><div style="width:80px">班级名称</div></th>
 						<th><div style="width:80px">考试时间</div></th>
-						<th><div style="width:80px">平均分</div></th>
+						<th><div style="width:80px" title="平均分=参考人总得分/参考人数">平均分<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px">班级总人数</div></th>
 						<th><div style="width:80px" title="得分>=80%">优秀人数<img src="../static/images/tip.png" style="width:16px"></div></th>
-						<th><div style="width:80px">优秀率</div></th>
+						<th><div style="width:80px" title="优秀率=优秀人数/班级人数">优秀率<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px" title="得分>=70%">良好人数<img src="../static/images/tip.png" style="width:16px"></div></th>
-						<th><div style="width:80px">良好率</div></th>
+						<th><div style="width:80px" title="良好率=良好人数/班级人数">良好率<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px" title="得分>=60%">及格人数<img src="../static/images/tip.png" style="width:16px"></div></th>
-						<th><div style="width:80px">及格率</div></th>
+						<th><div style="width:80px" title="及格率=及格人数/班级人数">及格率<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px" title="得分<=30%">低分人数<img src="../static/images/tip.png" style="width:16px"></div></th>
-						<th><div style="width:80px">低分率</div></th>
+						<th><div style="width:80px" title="低分率=低分人数/班级人数">低分率<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px">操作</div></th>
 					</tr>
 				</thead>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
index a547d7e..8f9bc58 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
@@ -82,12 +82,12 @@
 						<th><div style="width:80px">答案</div></th>
 						<th><div style="width:80px">答题人数</div></th>
 						<th><div style="width:80px">正确人数</div></th>
-						<th><div style="width:80px">正确率</div></th>
+						<th><div style="width:80px" title="正确率=正确人数/答题人数">正确率<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<th><div style="width:80px">满分值</div></th>
-						<th><div style="width:80px">平均分</div></th>
+						<th><div style="width:80px" title="平均分=正确人数/答题人数*题目分数">平均分<img src="../static/images/tip.png" style="width:16px"></div></th>
 						<c:forEach begin="0" end="${pd.MAX-1}" var="var" varStatus="vs">
 							<th><div style="width:80px">选 ${myelfun:jstlInt2Char(var+1)}人数</div></th>
-							<th><div style="width:80px">选${myelfun:jstlInt2Char(var+1)}比例</div></th>
+							<th><div style="width:80px" title="选${myelfun:jstlInt2Char(var+1)}比例=选${myelfun:jstlInt2Char(var+1)}人数/答题人数*100">选${myelfun:jstlInt2Char(var+1)}比例<img src="../static/images/tip.png" style="width:16px"></div></th>
 						</c:forEach>
 						<th><div style="width:80px">漏选人数</div></th>
 						<th><div style="width:80px">漏选比例</div></th>
@@ -99,13 +99,13 @@
 					<c:when test="${not empty varList}">
 						<c:forEach items="${varList}" var="var" varStatus="vs">
 						
-						<c:set var="right" value="${var.ANSWERNUM == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM * 100)}"></c:set>
+						<c:set var="right" value="${var.ANSWERNUM2 == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM2 * 100)}"></c:set>
 						
 							<tr>
 							
 								<td>${var.QUESTION_RANK}</td>
 								<td>${var.ANSWER}</td>
-								<td >${var.ANSWERNUM}</td>
+								<td >${var.ANSWERNUM2}</td>
 								<td >${var.RIGHTNUM}</td>
 								<td >
 									<c:if test="${right<=50}">
@@ -124,7 +124,7 @@
 								<td >${var.QUESTION_SCORE}</td>
 								<td >
 									<fmt:formatNumber type="number"
-									value="${var.ANSWERNUM == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM)*var.QUESTION_SCORE}"
+									value="${var.ANSWERNUM2 == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM2)*var.QUESTION_SCORE}"
 									maxFractionDigits="2" />
 								</td>
 								<c:set var="lth" value="${fn:length(var.optin_info)-1}"></c:set>
@@ -134,7 +134,7 @@
 									    <td>${optin_info[vs.index]}</td>
 										<td>
 											<fmt:formatNumber type="number"
-										value="${var.ANSWERNUM == 0 ? 0: (optin_info[vs.index] / var.ANSWERNUM * 100)}"
+										value="${var.ANSWERNUM2 == 0 ? 0: (optin_info[vs.index] / var.ANSWERNUM2 * 100)}"
 										maxFractionDigits="2" />%
 										</td>
 									</c:if>
@@ -147,7 +147,7 @@
 								<td>${var.optin_info[lth]}</td>
 								<td>
 									<fmt:formatNumber type="number"
-								value="${var.ANSWERNUM == 0 ? 0: (var.optin_info[lth] / var.ANSWERNUM * 100)}"
+								value="${var.ANSWERNUM2 == 0 ? 0: (var.optin_info[lth] / var.ANSWERNUM2 * 100)}"
 								maxFractionDigits="2" />%
 								</td>
 							</tr>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 58530e9..2721421 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -69,7 +69,7 @@
 						<p id="qingsongkao_paper">试卷管理</p>
 					</li>
 					<li>
-						<p>测验分析</p>
+						<p>考试情况</p>
 						<ul class="menu_2">
 							<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
 								<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p title="${var.CLASS_NAME}${var.CNAME}">${var.CLASS_NAME}${var.CNAME}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index 4d0a879..39f3a5a 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -37,7 +37,7 @@
 			<table style="margin-top:5px;margin-bottom:20px;">
 				<tr>
 					<td><div style="width:150px;text-align:center;">考试次数: ${info.testsize}</div></td>
-					<td><div style="width:150px;text-align:center;">班级名册: ${info.CLASS_NAME}</div></td>
+					<td><div style="width:250px;text-align:center;">班级名册: ${info.CLASS_NAME}</div></td>
 				
 					<td><div style="width:150px;text-align:center;"><span>学生人数: ${info.STUDENT_NUM}</span></div></td>
 					<td></td>
@@ -62,7 +62,7 @@
 						class="span10 date-picker" name="lastEnd" id="lastEnd" value="${end_date}"
 						type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
 						style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
-					<td style="vertical-align:top;padding-left:2px"><a style="height:30px;"
+					<td style="padding-left:2px"><a style="height:30px;"
 						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
 							id="nav-search-icon" style="line-height:20px"
 							class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
@@ -78,7 +78,7 @@
 				<thead>
 					<tr>
 						<th class="center th_name"><div style="width:150px;">姓名</div></th>
-						<th class="center "><div style="width:150px;" title="个人平均得分率=个人总分/试卷总分">个人平均得分率<img src="static/images/tip.png" style="width:16px"></div></th>
+						<th class="center "><div style="width:150px;" title="个人平均得分率=个人总分/参考试卷总分">个人平均得分率<img src="static/images/tip.png" style="width:16px"></div></th>
 						<th class="center"><div style="width:80px;" title="得分汇总=学生历史考试得分之和">得分汇总<img src="static/images/tip.png" style="width:16px"></div></th>
 						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
 							<th class="center kc"><a
@@ -104,7 +104,7 @@
 						</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:150px;"></div></td>
 						<td class="center"><div style="width:80px;"></div></td>
 						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
@@ -121,8 +121,10 @@
 									<%-- <td class="center"><a
 										href="report/student_report?studentid=${var.ID}&class_id=${info.CLASS_ID}">${var.NAME}</a>
 									</td> --%>
-									<td class="center"><div style="width:150px;cursor:hand"><a
-										 onclick="student('${info.CLASS_ID}','${var.STUDENT_ID}')">${var.NAME}</a></div>
+									<td class="center"><div style="width:150px;">
+									<%-- <a onclick="student('${info.CLASS_ID}','${var.STUDENT_ID}')">${var.NAME}</a> --%>
+										 ${var.NAME}
+										 </div>
 									</td>
 									<td class="center"><div style="width:150px;"><fmt:formatNumber type="number"
 											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
index e2026e1..dece05d 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
@@ -28,7 +28,7 @@
 </style>
 </head>
 
-<body style="background:#fff;/* overflow-y:hidden; */">
+<body style="background:#fff;overflow-x:auto;/* overflow-y:hidden; */">
 	<div style="padding:20px 20px;">
 
 		<form action="report/report_test.do" method="post" name="Form" id="Form">
diff --git a/WebRoot/static/css/teach.css b/WebRoot/static/css/teach.css
index 626f93e..fdb14a0 100644
--- a/WebRoot/static/css/teach.css
+++ b/WebRoot/static/css/teach.css
@@ -37,7 +37,13 @@ input[type="checkbox"]{margin-right:10px;}
 .menu_1 li{background:#1b535b;border-bottom: 1px solid #80afb4;}
 .menu_2 li{background:#333333;border-bottom: 1px dashed #80afb4;}
 .content .content_l .tab1 ul li:last-child{border:0;}
-.content .content_l .tab1 ul li p{padding-left:15%;font-size:18px;}
+.content .content_l .tab1 ul li p{padding-left: 15%;
+    font-size: 18px;
+    box-sizing: border-box;
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;}
 .content .content_r{margin-left:18%;height:100%;overflow-y:hidden;}
 
 
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index 237e653..e525cf4 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -442,6 +442,7 @@ public class PaperController extends BaseController {
 				temp.put("TEST_ID", tpListArray);
 				
 				List<PageData> queInfo = testpaperinfoService.listTestPaperQuestionIDinfo(temp);
+				List<PageData> answer_num = testpaperService.listAll(pd);
 				int answer[] = new int[option_num+1];
 				int right = 0;
 				for(int j=0;j<queInfo.size();j++){
@@ -464,6 +465,7 @@ public class PaperController extends BaseController {
 				}
 				temp.put("RIGHTNUM", right);
 				temp.put("ANSWERNUM",queInfo.size());
+				temp.put("ANSWERNUM2",answer_num.size());
 				temp.put("optin_info", answer);
 				templist.add(temp);
 			}
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 0137a04..997b11f 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -108,7 +108,9 @@ public class ReportController extends BaseController {
 				String totalScoreStr = item.getString("TOTAL_SCORE");
 				if(totalScoreStr != null){
 					try{
-						totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
+						if(lost.isEmpty()){
+							totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
+						}
 					}catch(Exception ex){
 						logger.info(ex);
 					}
@@ -116,6 +118,7 @@ public class ReportController extends BaseController {
 				if(score != null){
 					try{
 						getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
+						//getScore += Float.valueOf(score);
 					}catch(Exception ex){
 						logger.info(ex);
 					}
@@ -141,7 +144,9 @@ public class ReportController extends BaseController {
 				String totalScoreStr = item.getString("TOTAL_SCORE");
 				if(totalScoreStr != null){
 					try{
-						totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
+						if(lost.isEmpty()){
+							totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
+						}
 					}catch(Exception ex){
 						logger.info(ex);
 					}
--
libgit2 0.21.4