1.修复bug

jack
1 parent 5cf10579
Showing 11 changed files with 133 additions and 41 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
WebRoot/static/images/tip.png
resources/mybatis1/sunvote/StudentMapper.xml
src/com/fh/controller/sunvote/paper/PaperController.java
src/com/fh/controller/sunvote/student/StudentController.java
src/com/fh/service/sunvote/student/StudentManager.java
src/com/fh/service/sunvote/student/impl/StudentService.java
@@ -73,7 +73,8 @@
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
-				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<thead>
@@ -85,6 +86,7 @@
 						<th>出卷老师</th>
 						<th>创建时间</th>
 						<th>建议考试时长</th>
+						<th>考试次数</th>
 						<th>总分</th>
 						<th>操作</th>
 					</tr>
@@ -99,7 +101,8 @@
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
-				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<tbody>
@@ -114,6 +117,7 @@
 								<td >${myelfun:findTeacherName(var.USER_ID)}</td>
 								<td >${var.CREATE_DATE}</td>
 								<td >${var.EXAM_TIME}</td>
+								<td >${var.TEST_NUM}</td>
 								<td >${var.SCORE}</td>
 								<td ><a href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a></td>
 							</tr>
@@ -60,10 +60,11 @@
 				<col style="width: 10%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 15%" />
-				<col style="width: 10%" />
+				<col style="width: 8%" />
+				<col style="width: 8%" />
+				<col style="width: 13%" />
+				<col style="width: 8%" />
+				<col style="width: 8%" />
 				<col style="width: 15%" />
 				<thead>
 					<tr>
@@ -73,6 +74,7 @@
 						<th>年级</th>
 						<th>科目</th>
 						<th>建议考试时长</th>
+						<th>考试次数</th>
 						<th>总分</th>
 						<th>操作</th>
 					</tr>
@@ -85,10 +87,11 @@
 				<col style="width: 10%" />
 				<col style="width: 15%" />
 				<col style="width: 15%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 15%" />
-				<col style="width: 10%" />
+				<col style="width: 8%" />
+				<col style="width: 8%" />
+				<col style="width: 13%" />
+				<col style="width: 8%" />
+				<col style="width: 8%" />
 				<col style="width: 15%" />
 				<tbody>
 				<c:choose>
@@ -101,6 +104,7 @@
 								<td >${myelfun:findGradeName(var.GRADE_ID)}</td>
 								<td >${myelfun:findSubjectCName(var.SUBJECT_ID)}</td>
 								<td >${var.EXAM_TIME}</td>
+								<td >${var.TEST_NUM}</td>
 								<td >${var.SCORE}</td>
 								<td>
 								<a href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a>
@@ -55,8 +55,9 @@
 		</div>
 		<div class="table_box" style="padding:0 5%;background:#fff;">
 			<div style="padding:15px 0;background:#fff;" class="paper_title">
-				&nbsp;
-				试卷名称：${myelfun:findPaperName(pd.PAPER_ID)}
+				<b>试卷名称：</b>${myelfun:findPaperName(pd.PAPER_ID)}
+				<br/>
+				<b>试卷总分：</b>${pd.TOTAL_SCORE}分
 			</div>
 			<table id="simple-table"
@@ -69,13 +70,13 @@
 						<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="得分>=80%">优秀人数</div></th>
+						<th><div style="width:80px" title="得分>=80%">优秀人数<img src="../static/images/tip.png" style="width:12px"></div></th>
 						<th><div style="width:80px">优秀率</div></th>
-						<th><div style="width:80px" title="得分>=70%">良好人数</div></th>
+						<th><div style="width:80px" title="得分>=70%">良好人数<img src="../static/images/tip.png" style="width:12px"></div></th>
 						<th><div style="width:80px">良好率</div></th>
-						<th><div style="width:80px" title="得分>=60%">及格人数</div></th>
+						<th><div style="width:80px" title="得分>=60%">及格人数<img src="../static/images/tip.png" style="width:12px"></div></th>
 						<th><div style="width:80px">及格率</div></th>
-						<th><div style="width:80px" title="得分>=30%">低分人数</div></th>
+						<th><div style="width:80px" title="得分>=30%">低分人数<img src="../static/images/tip.png" style="width:12px"></div></th>
 						<th><div style="width:80px">低分率</div></th>
 						<th><div style="width:80px">操作</div></th>
 					</tr>
@@ -174,7 +175,7 @@
 								<td >
 								<c:if test="${not empty var.class_id }">
-								<a href="<%=basePath%>paper/paperRep2.do?CLASS_ID=${var.class_id}&PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}">查看成绩</a>
+								<a href="<%=basePath%>paper/paperRep2.do?CLASS_ID=${var.class_id}&PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaper_id}&CREAT_TIME=${var.creat_time}">查看成绩</a>
 								</c:if>
 								  <c:if test="${empty var.class_id }">
 								<a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a>
@@ -58,12 +58,14 @@
 		<div class="table_box" style="padding:0 5%;background:#fff;">
 			<div style="padding:15px 0;background:#fff;" class="paper_title">
 				&nbsp;
-				试卷名称：${myelfun:findPaperName(pd.PAPER_ID)}
+				<b>试卷名称：</b>${myelfun:findPaperName(pd.PAPER_ID)}
 				<c:if test="${not empty pd.CLASS_ID }">
-					班级名称：${myelfun:findClassName(pd.CLASS_ID)}
+					&nbsp;&nbsp;&nbsp;&nbsp;<b>班级名称：</b>${myelfun:findClassName(pd.CLASS_ID)}
+					&nbsp;&nbsp;&nbsp;&nbsp;<b>考试时间：</b>${pd.CREAT_TIME}
 				</c:if>
+				
 			</div>
 			<table id="simple-table"
@@ -91,6 +93,9 @@
 					<c:choose>
 					<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>
+						
 							<tr>
 								<td>${var.QUESTION_RANK}</td>
@@ -98,9 +103,18 @@
 								<td >${var.ANSWERNUM}</td>
 								<td >${var.RIGHTNUM}</td>
 								<td >
-									<fmt:formatNumber type="number"
-									value="${var.ANSWERNUM == 0 ? 0: (var.RIGHTNUM / var.ANSWERNUM * 100)}"
-									maxFractionDigits="2" />%
+									<c:if test="${right<=50}">
+										<span style="color:red"><fmt:formatNumber type="number"
+									value="${right}"
+									maxFractionDigits="2" />%</span>
+									</c:if>
+									<c:if test="${right>50}">
+										<span style="color:red"><fmt:formatNumber type="number"
+									value="${right}"
+									maxFractionDigits="2" />%</span>
+									</c:if>
+									
+									
 								</td>
 								<td >${var.QUESTION_SCORE}</td>
 								<td >
@@ -27,6 +27,10 @@
       <script src="https://cdn.bootcss.com/html5shiv/3.7.3/html5shiv.min.js"></script>
       <script src="https://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
+<style type="text/css">
+	#remove{
+	background:#ccc}
+</style>
 </head>
 <body>
@@ -44,15 +48,17 @@
 			<div style="padding:0 5%;background:#fff;">
 			<table class="table table-striped">
 				<col style="width: 10%" />
-				<col style="width: 22%" />
-				<col style="width: 22%" />
-				<col style="width: 23%" />
-				<col style="width: 23%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
 				<thead>
 					<tr>
 						<th><input type="checkbox" value="0" name='ids' id="ids"  />序号</th>
 						<th>姓名</th>
 						<th>学号</th>
+						<th>性别</th>
 						<th>键盘ID</th>
 						<th>操作</th>
 					</tr>
@@ -64,10 +70,11 @@
 		<div class="table_box">
 			<table class="table table-striped">
 				<col style="width: 10%" />
-				<col style="width: 22%" />
-				<col style="width: 22%" />
-				<col style="width: 23%" />
-				<col style="width: 23%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
+				<col style="width: 10%" />
+				<col style="width: 20%" />
+				<col style="width: 20%" />
 				<tbody>
 				<c:choose>
 					<c:when test="${not empty varList}">
@@ -76,6 +83,14 @@
 								<td><input type="checkbox" name='ids' id="ids"  value="${var.ID}" />${vs.index+1}</td>
 									<td class='center'>${var.NAME}</td>
 											<td>${var.NUMBER}</td>
+											<td>
+												<c:if test="${var.SEX == 0}">
+													女
+												</c:if>
+												<c:if test="${var.SEX == 1}">
+													男
+												</c:if>
+											</td>
 											<td>${var.KEYPAD_ID}</td>
 											<td><a href="#" onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="../static/images/eidtor.png" /></a><a href="#" onclick="del('${var.ID}');"><img src="../static/images/remove.png" /></a></td>
@@ -106,7 +121,7 @@
 					<input type="button" onclick="export2();" value="批量导出" />
 				</div>
 				<div class="removeAll" >
-					<input type="button" onclick="deleteAll();" value="批量删除" />
+					<input type="button" onclick="deleteAll();" disabled id="remove" value="批量删除" />
 				</div>
 				<div class="page_box">
 					<div class="pagination" style="float: right;padding-top: 0px;margin-top: 0px;">${page.pageStr}</div>
@@ -220,6 +235,22 @@
 		function export2(){
 			window.open('<%=basePath%>student/excel?class_id=${pd.CLASS_ID}','_blank');
 		}
+		$("input[type=checkbox]").on('click',function(){
+			var str = '';
+			for(var i=0;i < document.getElementsByName('ids').length;i++){
+			  if(document.getElementsByName('ids')[i].checked){
+			  	if(str=='') str += document.getElementsByName('ids')[i].value;
+			  	else str += ',' + document.getElementsByName('ids')[i].value;
+			  }
+			}
+			if(str==''){
+				$("#remove").attr("disabled","disabled");
+				$("#remove").css("background","#ccc");
+			}else{
+				$("#remove").removeAttr("disabled");
+				$("#remove").css("background","#f29c9f");
+			}
+		})
 </script>
 </html>
 \ No newline at end of file
@@ -88,6 +88,17 @@
 	</select>
 	<!-- 通过ID获取数据 -->
+	<select id="findByNumberAndKeyPadId" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			NAME = #{NAME}
+			and NUMBER = #{NUMBER}
+			and KEYPAD_ID = #{KEYPAD_ID}
+	</select>
+	<!-- 通过ID获取数据 -->
 	<select id="findByClassId" parameterType="pd" resultType="pd">
 		select 
 		<include refid="Field"></include>
@@ -199,12 +199,12 @@ public class PaperController extends BaseController {
 		List<PageData> templist = new ArrayList<PageData>();
 		PageData saveData = new PageData();
 		DecimalFormat decimalFormat=new DecimalFormat("0.00");
-		
+		String total_score = "";
 		ResponseGson<PageData> res = new ResponseGson();
 		pd = this.getPageData();
 		if(pd.containsKey("PAPER_ID")){
 			List<PageData> list = testpaperService.listAll(pd);
-			
+			total_score = list.get(0).getString("TOTAL_SCORE");
 			pd.put("testpaperlist", list);
 			Integer you_sum = 0;   //优秀总人数
 			Integer liang_sum = 0; //良好总人数
@@ -283,7 +283,7 @@ public class PaperController extends BaseController {
 		saveData.put("list", templist);
-		
+		pd.put("TOTAL_SCORE", total_score);
 		mv.setViewName("sunvote/paper/test_list1");
 		mv.addObject("varList", templist);
 		mv.addObject("pd",pd);
@@ -858,6 +858,9 @@ public class PaperController extends BaseController {
 		for(PageData p:varList){
 			String examTime = p.getString("EXAM_TIME");
+			PageData temp = new PageData();
+			temp.put("PAPER_ID", p.getString("PAPER_ID"));
+			List<PageData> li = testpaperService.listAll(temp);
 			if(examTime != null){
 				try{
 					int et = Integer.parseInt(examTime);
@@ -882,6 +885,7 @@ public class PaperController extends BaseController {
 				examTime = "0";
 			}
 			p.put("EXAM_TIME", examTime);
+			p.put("TEST_NUM", li.size());
 		}
 		PageData tpd = new PageData();
@@ -926,6 +930,10 @@ public class PaperController extends BaseController {
 		for(PageData p:varList){
 			String examTime = p.getString("EXAM_TIME");
+			PageData temp = new PageData();
+			temp.put("PAPER_ID", p.getString("PAPER_ID"));
+			List<PageData> li = testpaperService.listAll(temp);
+			
 			if(examTime != null){
 				try{
 					int et = Integer.parseInt(examTime);
@@ -950,6 +958,7 @@ public class PaperController extends BaseController {
 				examTime = "0";
 			}
 			p.put("EXAM_TIME", examTime);
+			p.put("TEST_NUM", li.size());
 		}
 		mv.addObject("varList", varList);
@@ -147,20 +147,27 @@ public class StudentController extends BaseController {
 				for(int i = 1 ; i < listPd.size();i++){
 					PageData savePd = new PageData();
 					PageData temp = listPd.get(i);
-					for(int j = 0 ;j<3 ;j++){
+					
+					for(int j = 0 ;j<4 ;j++){
 //						if(temp.get("var" + j) == null){
 //							break ;
 //						}
 						if(temp.get("var" + j) != null && !"".equals(temp.get("var" + j).toString())){
 							savePd.put(pd.getString("var" + j).toUpperCase(), temp.get("var" + j));
 						}else{
-							mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行有空数据");
-							mv.addObject("state","fail");
-							mv.setViewName("save_result2");
-							return mv;
+							if(j==3){
+								continue;
+							}else{
+								mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，第"+i+"行有空数据");
+								mv.addObject("state","fail");
+								mv.setViewName("save_result2");
+								return mv;
+							}
 						}
 					}
-					if(!savePd.containsKey("ID")){
+					List<PageData> lnum = studentService.findByNumberAndKeyPadId(savePd);
+					
+					if(lnum.size()<1){
 						if (savePd.values().size() > 0) {
 							String studentId = this.get32UUID();
 							savePd.put("ID", studentId);
@@ -178,7 +185,11 @@ public class StudentController extends BaseController {
 						}
 					}else{
-						studentService.edit(savePd);
+						mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，学号不可重复，请检查学生名单后重新导入");
+						mv.addObject("state","fail");
+						mv.setViewName("save_result2");
+						return mv;
+						
 					}
 				}
@@ -57,6 +57,8 @@ public interface StudentManager{
 	public List<PageData> findByClassId(PageData pd)throws Exception;
+	
+	public List<PageData> findByNumberAndKeyPadId(PageData pd)throws Exception;
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
@@ -84,6 +84,11 @@ public class StudentService implements StudentManager{
 		return (List<PageData>)dao.findForList("StudentMapper.findByClassId", pd);
 	}
+	@SuppressWarnings("unchecked")
+	public List<PageData> findByNumberAndKeyPadId(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("StudentMapper.findByNumberAndKeyPadId", pd);
+	}
+	
 	@SuppressWarnings("unchecked")
 	public List<PageData> listAllClass(PageData pd)throws Exception{