From 1fe919d53168dd9019827f33d787268208245730 Mon Sep 17 00:00:00 2001
From: jack_rabbit <376168706@qq.com>
Date: Wed, 11 Dec 2019 17:08:49 +0800
Subject: [PATCH] 1.学生键盘号和学号不能重复 2.修改文案，增加面包屑

---
 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp            |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp            |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp             |  8 ++++----
 WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp             |  5 +++++
 WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp          |  2 +-
 WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp        |  6 +++---
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp        | 18 +++++++++---------
 resources/mybatis1/sunvote/StudentMapper.xml                 |  7 +++----
 src/com/fh/controller/sunvote/student/StudentController.java | 11 +++++++++--
 9 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
index 61681f5..9bc0a86 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
@@ -119,7 +119,7 @@
 								<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>
+								<td ><a href="<%=basePath%>paper/paperRep.do?MB1=gr&paper_id=${var.PAPER_ID}">查看成绩</a></td>
 							</tr>
 						
 						</c:forEach>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
index d120707..38dc3ac 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
@@ -107,7 +107,7 @@
 								<td >${var.TEST_NUM}</td>
 								<td >${var.SCORE}</td>
 								<td>
-								<a href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a>
+								<a href="<%=basePath%>paper/paperRep.do?MB1=nj&paper_id=${var.PAPER_ID}">查看成绩</a>
 								<a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
 								</td>
 							</tr>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
index 9b87ab5..e6fe36a 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
@@ -41,7 +41,7 @@
 		<div class="box_header">
 			<div class="head_box_l">
 				<p>
-					<span class="right_b"></span>试卷测验列表
+					<span class="right_b"></span>班级对比
 				</p>
 			</div>
 			<div class="head_box_r">
@@ -76,7 +76,7 @@
 						<th><div style="width:80px">良好率</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%">低分人数<img src="../static/images/tip.png" style="width:12px"></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>
@@ -175,10 +175,10 @@
 								<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}&CREAT_TIME=${var.creat_time}">查看成绩</a>
+								<a href="<%=basePath%>paper/paperRep2.do?MB1=${pd.MB1 }&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>
+								<a href="<%=basePath%>paper/paperRep2.do?MB1=${pd.MB1 }&PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a>
 								</c:if>
 								</td>
 							</tr>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
index 61b6fa0..751bbba 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
@@ -57,6 +57,11 @@
 		</div>
 		<div class="table_box" style="padding:0 5%;background:#fff;">
 			<div style="padding:15px 0;background:#fff;" class="paper_title">
+			
+				${pd.MB1=="nj"?"年级卷":"个人卷"} > 班级对比 > 答题分析
+				<br/>
+				<br/>
+				<br/>
 				&nbsp;
 				<b>试卷名称：</b>${myelfun:findPaperName(pd.PAPER_ID)}
 				
diff --git a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
index 64b1c56..ec45230 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
@@ -69,7 +69,7 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td>
-								<td><input type="text" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="这里输入班级名称" title="班级名称" style="width:98%;"/></td>
+								<td><input type="text" autocomplete="off" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="这里输入班级名称" title="班级名称" style="width:98%;"/></td>
 							</tr>
 							<%-- <tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级编码:</td>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
index 557b9ef..62a7f20 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
@@ -93,21 +93,21 @@ input[type="text"],select {
 			<li>
 				<p><span style="color:#f00">*</span>学生姓名:</p>
 				<div class="li_r">
-					<input type="text" name="NAME" id="NAME" value="${pd.NAME}"
+					<input type="text" autocomplete="off" name="NAME" id="NAME" value="${pd.NAME}"
 						maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" />
 				</div>
 			</li>
 			<li>
 				<p><span style="color:#f00">*</span>学号:</p>
 				<div class="li_r">
-					<input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"
+					<input type="text" autocomplete="off" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"
 						maxlength="255" placeholder="这里输入学号" title="学号" />
 				</div>
 			</li>
 			<li>
 				<p><span style="color:#f00">*</span>键盘ID:</p>
 				<div class="li_r">
-					<input type="text" name="KEYPAD_ID" id="KEYPAD_ID"
+					<input type="text" autocomplete="off" name="KEYPAD_ID" id="KEYPAD_ID"
 						value="${pd.KEYPAD_ID}" placeholder="这里输入键盘ID"
 						title="键盘ID" />
 				</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
index c539a60..eba788e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
@@ -40,30 +40,30 @@
 						<table id="table_report" class="table">
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
-								<td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td>
+								<td><input type="text" autocomplete="off" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">电话:</td>
-								<td><input type="text" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入电话" title="电话" style="width:98%;"/></td>
+								<td><input type="text" autocomplete="off" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入电话" title="电话" style="width:98%;"/></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">座机电话:</td>
-								<td><input type="text" name="SEAT_PHONE" id="SEAT_PHONE" value="${pd.SEAT_PHONE}" maxlength="255" placeholder="这里输入座机电话" title="座机电话" style="width:98%;"/></td>
+								<td><input type="text" autocomplete="off" name="SEAT_PHONE" id="SEAT_PHONE" value="${pd.SEAT_PHONE}" maxlength="255" placeholder="这里输入座机电话" title="座机电话" style="width:98%;"/></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">证件号:</td>
-								<td><input type="text" name="CARD_NO" id="CARD_NO" value="${pd.CARD_NO}" maxlength="255" placeholder="这里输入证件号" title="证件号" style="width:98%;"/></td>
+								<td><input type="text" autocomplete="off" name="CARD_NO" id="CARD_NO" value="${pd.CARD_NO}" maxlength="255" placeholder="这里输入证件号" title="证件号" style="width:98%;"/></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">账号:</td>
-								<td><input type="text" name="ACCOUT" id="ACCOUT" value="${pd.ACCOUT}" <c:if test="${not empty pd.ACCOUT}">disabled="disabled" </c:if>  maxlength="255" placeholder="这里输入账号" title="账号" style="width:98%;"/></td>
+								<td><input type="text" autocomplete="off" name="ACCOUT" id="ACCOUT" value="${pd.ACCOUT}" <c:if test="${not empty pd.ACCOUT}">disabled="disabled" </c:if>  maxlength="255" placeholder="这里输入账号" title="账号" style="width:98%;"/></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
 								<td>
-									<input type="password" name="PASSWORD" id="PASSWORD2" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码"  style="opacity:0;height:0;padding:0;margin:0;border:0;float:left;"/>
-									<input type="text" name="KEYPAD_ID" id="KEYPAD_ID2" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="opacity:0;height:0;padding:0;margin:0;border:0;float:left;"/>
-									<input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;" />
+									<input type="password" autocomplete="off" name="PASSWORD" id="PASSWORD2" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码"  style="opacity:0;height:0;padding:0;margin:0;border:0;float:left;"/>
+									<input type="text" autocomplete="off" name="KEYPAD_ID" id="KEYPAD_ID2" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="opacity:0;height:0;padding:0;margin:0;border:0;float:left;"/>
+									<input type="password" autocomplete="off" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;" />
 								</td>
 							</tr>
 							<tr>
@@ -82,7 +82,7 @@
 							</tr> --%>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">教师卡编号:</td>
-								<td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
+								<td><input type="text" autocomplete="off" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">所教科目:</td>
diff --git a/resources/mybatis1/sunvote/StudentMapper.xml b/resources/mybatis1/sunvote/StudentMapper.xml
index 8c3e128..1025a13 100644
--- a/resources/mybatis1/sunvote/StudentMapper.xml
+++ b/resources/mybatis1/sunvote/StudentMapper.xml
@@ -93,10 +93,9 @@
 		<include refid="Field"></include>
 		from 
 		<include refid="tableName"></include>
-		where 
-			NAME = #{NAME}
-			and NUMBER = #{NUMBER}
-			and KEYPAD_ID = #{KEYPAD_ID}
+		where
+		 NUMBER = #{NUMBER}
+		 or KEYPAD_ID = #{KEYPAD_ID}
 	</select>
 	<!-- 通过ID获取数据 -->
 	<select id="findByClassId" parameterType="pd" resultType="pd">
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index 4e67629..239563b 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -84,7 +84,14 @@ public class StudentController extends BaseController {
 		pd.put("ID", studentID);
 		pd.put("STUDENT_ID", studentID);
 		pd.put("SNO", pd.get("NUMBER"));
-		studentService.save(pd);
+		List<PageData> lnum = studentService.findByNumberAndKeyPadId(pd);
+		if(lnum.size()>0){
+			mv.addObject("msg","学号或键盘号重复");
+			mv.setViewName("save_result2");
+			return mv;
+		}else{
+			studentService.save(pd);
+		}
 		
 		String termID = pd.getString("TERM_ID");
 		String classID = pd.getString("CLASS_ID");
@@ -185,7 +192,7 @@ public class StudentController extends BaseController {
 						}
 						
 					}else{
-						mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，学号不可重复，请检查学生名单后重新导入");
+						mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，学号或键盘不可重复，请检查学生名单后重新导入");
 						mv.addObject("state","fail");
 						mv.setViewName("save_result2");
 						return mv;
--
libgit2 0.21.4