孙向锦 / SunvoteEducation

Commit 1fe919d53168dd9019827f33d787268208245730

Authored by jack
1 parent 66e7db61

1.学生键盘号和学号不能重复 

2.修改文案，增加面包屑
Inline Side-by-side
Showing 9 changed files with 36 additions and 25 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
  View file @1fe919d
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 <td >${var.EXAM_TIME}</td> 119 <td >${var.EXAM_TIME}</td>
120 <td >${var.TEST_NUM}</td> 120 <td >${var.TEST_NUM}</td>
121 <td >${var.SCORE}</td> 121 <td >${var.SCORE}</td>
122 - <td ><a href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a></td> 122 + <td ><a href="<%=basePath%>paper/paperRep.do?MB1=gr&paper_id=${var.PAPER_ID}">查看成绩</a></td>
123 </tr> 123 </tr>
124 124
125 </c:forEach> 125 </c:forEach>
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list5.jsp
  View file @1fe919d
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 <td >${var.TEST_NUM}</td> 107 <td >${var.TEST_NUM}</td>
108 <td >${var.SCORE}</td> 108 <td >${var.SCORE}</td>
109 <td> 109 <td>
110 - <a href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩</a> 110 + <a href="<%=basePath%>paper/paperRep.do?MB1=nj&paper_id=${var.PAPER_ID}">查看成绩</a>
111 <a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a> 111 <a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
112 </td> 112 </td>
113 </tr> 113 </tr>
WebRoot/WEB-INF/jsp/sunvote/paper/test_list1.jsp
  View file @1fe919d
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <div class="box_header"> 41 <div class="box_header">
42 <div class="head_box_l"> 42 <div class="head_box_l">
43 <p> 43 <p>
44 - <span class="right_b"></span>试卷测验列表 44 + <span class="right_b"></span>班级对比
45 </p> 45 </p>
46 </div> 46 </div>
47 <div class="head_box_r"> 47 <div class="head_box_r">
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <th><div style="width:80px">良好率</div></th> 76 <th><div style="width:80px">良好率</div></th>
77 <th><div style="width:80px" title="得分>=60%">及格人数<img src="../static/images/tip.png" style="width:12px"></div></th> 77 <th><div style="width:80px" title="得分>=60%">及格人数<img src="../static/images/tip.png" style="width:12px"></div></th>
78 <th><div style="width:80px">及格率</div></th> 78 <th><div style="width:80px">及格率</div></th>
79 - <th><div style="width:80px" title="得分>=30%">低分人数<img src="../static/images/tip.png" style="width:12px"></div></th> 79 + <th><div style="width:80px" title="得分<=30%">低分人数<img src="../static/images/tip.png" style="width:12px"></div></th>
80 <th><div style="width:80px">低分率</div></th> 80 <th><div style="width:80px">低分率</div></th>
81 <th><div style="width:80px">操作</div></th> 81 <th><div style="width:80px">操作</div></th>
82 </tr> 82 </tr>
@@ -175,10 +175,10 @@ @@ -175,10 +175,10 @@
175 <td > 175 <td >
176 176
177 <c:if test="${not empty var.class_id }"> 177 <c:if test="${not empty var.class_id }">
178 - <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> 178 + <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>
179 </c:if> 179 </c:if>
180 <c:if test="${empty var.class_id }"> 180 <c:if test="${empty var.class_id }">
181 - <a href="<%=basePath%>paper/paperRep2.do?PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a> 181 + <a href="<%=basePath%>paper/paperRep2.do?MB1=${pd.MB1 }&PAPER_ID=${pd.PAPER_ID}&TESTPAPER_ID=${var.testpaperList}">查看成绩</a>
182 </c:if> 182 </c:if>
183 </td> 183 </td>
184 </tr> 184 </tr>
WebRoot/WEB-INF/jsp/sunvote/paper/test_list2.jsp
  View file @1fe919d
@@ -57,6 +57,11 @@ @@ -57,6 +57,11 @@
57 </div> 57 </div>
58 <div class="table_box" style="padding:0 5%;background:#fff;"> 58 <div class="table_box" style="padding:0 5%;background:#fff;">
59 <div style="padding:15px 0;background:#fff;" class="paper_title"> 59 <div style="padding:15px 0;background:#fff;" class="paper_title">
  60 +
  61 + ${pd.MB1=="nj"?"年级卷":"个人卷"} > 班级对比 > 答题分析
  62 + <br/>
  63 + <br/>
  64 + <br/>
60 &nbsp; 65 &nbsp;
61 <b>试卷名称：</b>${myelfun:findPaperName(pd.PAPER_ID)} 66 <b>试卷名称：</b>${myelfun:findPaperName(pd.PAPER_ID)}
62 67
WebRoot/WEB-INF/jsp/sunvote/sclass/sclass_edit2.jsp
  View file @1fe919d
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 </tr> 69 </tr>
70 <tr> 70 <tr>
71 <td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td> 71 <td style="width:75px;text-align: right;padding-top: 13px;">班级名称:</td>
72 - <td><input type="text" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="这里输入班级名称" title="班级名称" style="width:98%;"/></td> 72 + <td><input type="text" autocomplete="off" name="CLASS_NAME" id="CLASS_NAME" value="${pd.CLASS_NAME}" maxlength="255" placeholder="这里输入班级名称" title="班级名称" style="width:98%;"/></td>
73 </tr> 73 </tr>
74 <%-- <tr> 74 <%-- <tr>
75 <td style="width:75px;text-align: right;padding-top: 13px;">班级编码:</td> 75 <td style="width:75px;text-align: right;padding-top: 13px;">班级编码:</td>
WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
  View file @1fe919d
@@ -93,21 +93,21 @@ input[type=&quot;text&quot;],select { @@ -93,21 +93,21 @@ input[type=&quot;text&quot;],select {
93 <li> 93 <li>
94 <p><span style="color:#f00">*</span>学生姓名:</p> 94 <p><span style="color:#f00">*</span>学生姓名:</p>
95 <div class="li_r"> 95 <div class="li_r">
96 - <input type="text" name="NAME" id="NAME" value="${pd.NAME}" 96 + <input type="text" autocomplete="off" name="NAME" id="NAME" value="${pd.NAME}"
97 maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" /> 97 maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" />
98 </div> 98 </div>
99 </li> 99 </li>
100 <li> 100 <li>
101 <p><span style="color:#f00">*</span>学号:</p> 101 <p><span style="color:#f00">*</span>学号:</p>
102 <div class="li_r"> 102 <div class="li_r">
103 - <input type="text" name="NUMBER" id="NUMBER" value="${pd.NUMBER}" 103 + <input type="text" autocomplete="off" name="NUMBER" id="NUMBER" value="${pd.NUMBER}"
104 maxlength="255" placeholder="这里输入学号" title="学号" /> 104 maxlength="255" placeholder="这里输入学号" title="学号" />
105 </div> 105 </div>
106 </li> 106 </li>
107 <li> 107 <li>
108 <p><span style="color:#f00">*</span>键盘ID:</p> 108 <p><span style="color:#f00">*</span>键盘ID:</p>
109 <div class="li_r"> 109 <div class="li_r">
110 - <input type="text" name="KEYPAD_ID" id="KEYPAD_ID" 110 + <input type="text" autocomplete="off" name="KEYPAD_ID" id="KEYPAD_ID"
111 value="${pd.KEYPAD_ID}" placeholder="这里输入键盘ID" 111 value="${pd.KEYPAD_ID}" placeholder="这里输入键盘ID"
112 title="键盘ID" /> 112 title="键盘ID" />
113 </div> 113 </div>
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
  View file @1fe919d
@@ -40,30 +40,30 @@ @@ -40,30 +40,30 @@
40 <table id="table_report" class="table"> 40 <table id="table_report" class="table">
41 <tr> 41 <tr>
42 <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td> 42 <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
43 - <td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td> 43 + <td><input type="text" autocomplete="off" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td>
44 </tr> 44 </tr>
45 <tr> 45 <tr>
46 <td style="width:75px;text-align: right;padding-top: 13px;">电话:</td> 46 <td style="width:75px;text-align: right;padding-top: 13px;">电话:</td>
47 - <td><input type="text" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入电话" title="电话" style="width:98%;"/></td> 47 + <td><input type="text" autocomplete="off" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入电话" title="电话" style="width:98%;"/></td>
48 </tr> 48 </tr>
49 <tr> 49 <tr>
50 <td style="width:75px;text-align: right;padding-top: 13px;">座机电话:</td> 50 <td style="width:75px;text-align: right;padding-top: 13px;">座机电话:</td>
51 - <td><input type="text" name="SEAT_PHONE" id="SEAT_PHONE" value="${pd.SEAT_PHONE}" maxlength="255" placeholder="这里输入座机电话" title="座机电话" style="width:98%;"/></td> 51 + <td><input type="text" autocomplete="off" name="SEAT_PHONE" id="SEAT_PHONE" value="${pd.SEAT_PHONE}" maxlength="255" placeholder="这里输入座机电话" title="座机电话" style="width:98%;"/></td>
52 </tr> 52 </tr>
53 <tr> 53 <tr>
54 <td style="width:75px;text-align: right;padding-top: 13px;">证件号:</td> 54 <td style="width:75px;text-align: right;padding-top: 13px;">证件号:</td>
55 - <td><input type="text" name="CARD_NO" id="CARD_NO" value="${pd.CARD_NO}" maxlength="255" placeholder="这里输入证件号" title="证件号" style="width:98%;"/></td> 55 + <td><input type="text" autocomplete="off" name="CARD_NO" id="CARD_NO" value="${pd.CARD_NO}" maxlength="255" placeholder="这里输入证件号" title="证件号" style="width:98%;"/></td>
56 </tr> 56 </tr>
57 <tr> 57 <tr>
58 <td style="width:75px;text-align: right;padding-top: 13px;">账号:</td> 58 <td style="width:75px;text-align: right;padding-top: 13px;">账号:</td>
59 - <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> 59 + <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>
60 </tr> 60 </tr>
61 <tr> 61 <tr>
62 <td style="width:75px;text-align: right;padding-top: 13px;">密码:</td> 62 <td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
63 <td> 63 <td>
64 - <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;"/>  
65 - <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;"/>  
66 - <input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;" /> 64 + <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;"/>
  65 + <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;"/>
  66 + <input type="password" autocomplete="off" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;" />
67 </td> 67 </td>
68 </tr> 68 </tr>
69 <tr> 69 <tr>
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 </tr> --%> 82 </tr> --%>
83 <tr> 83 <tr>
84 <td style="width:75px;text-align: right;padding-top: 13px;">教师卡编号:</td> 84 <td style="width:75px;text-align: right;padding-top: 13px;">教师卡编号:</td>
85 - <td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td> 85 + <td><input type="text" autocomplete="off" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
86 </tr> 86 </tr>
87 <tr> 87 <tr>
88 <td style="width:75px;text-align: right;padding-top: 13px;">所教科目:</td> 88 <td style="width:75px;text-align: right;padding-top: 13px;">所教科目:</td>
resources/mybatis1/sunvote/StudentMapper.xml
  View file @1fe919d
@@ -93,10 +93,9 @@ @@ -93,10 +93,9 @@
93 <include refid="Field"></include> 93 <include refid="Field"></include>
94 from 94 from
95 <include refid="tableName"></include> 95 <include refid="tableName"></include>
96 - where  
97 - NAME = #{NAME}  
98 - and NUMBER = #{NUMBER}  
99 - and KEYPAD_ID = #{KEYPAD_ID} 96 + where
  97 + NUMBER = #{NUMBER}
  98 + or KEYPAD_ID = #{KEYPAD_ID}
100 </select> 99 </select>
101 <!-- 通过ID获取数据 --> 100 <!-- 通过ID获取数据 -->
102 <select id="findByClassId" parameterType="pd" resultType="pd"> 101 <select id="findByClassId" parameterType="pd" resultType="pd">
src/com/fh/controller/sunvote/student/StudentController.java
  View file @1fe919d
@@ -84,7 +84,14 @@ public class StudentController extends BaseController { @@ -84,7 +84,14 @@ public class StudentController extends BaseController {
84 pd.put("ID", studentID); 84 pd.put("ID", studentID);
85 pd.put("STUDENT_ID", studentID); 85 pd.put("STUDENT_ID", studentID);
86 pd.put("SNO", pd.get("NUMBER")); 86 pd.put("SNO", pd.get("NUMBER"));
87 - studentService.save(pd); 87 + List<PageData> lnum = studentService.findByNumberAndKeyPadId(pd);
  88 + if(lnum.size()>0){
  89 + mv.addObject("msg","学号或键盘号重复");
  90 + mv.setViewName("save_result2");
  91 + return mv;
  92 + }else{
  93 + studentService.save(pd);
  94 + }
88 95
89 String termID = pd.getString("TERM_ID"); 96 String termID = pd.getString("TERM_ID");
90 String classID = pd.getString("CLASS_ID"); 97 String classID = pd.getString("CLASS_ID");
@@ -185,7 +192,7 @@ public class StudentController extends BaseController { @@ -185,7 +192,7 @@ public class StudentController extends BaseController {
185 } 192 }
186 193
187 }else{ 194 }else{
188 - mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，学号不可重复，请检查学生名单后重新导入"); 195 + mv.addObject("msg","本次成功导入"+(i-1>=0?i-1:0)+"条数据，学号或键盘不可重复，请检查学生名单后重新导入");
189 mv.addObject("state","fail"); 196 mv.addObject("state","fail");
190 mv.setViewName("save_result2"); 197 mv.setViewName("save_result2");
191 return mv; 198 return mv;