阅卷编号修改为studentId；在标记试卷和成绩查询增加编号查询

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/query/ExamStudentSearchQuery.java

@@ -69,6 +69,8 @@ public class ExamStudentSearchQuery extends BaseQuery<ExamStudent> {
     private Double endScroe;
 
     private Boolean breach;
+    
+    private Integer studentId;
 
     public void orderByExamNumber() {
         setSort(new Sort(Direction.ASC, "examNumber"));
@@ -321,4 +323,12 @@ public class ExamStudentSearchQuery extends BaseQuery<ExamStudent> {
     public void setManualAbsent(Boolean manualAbsent) {
         this.manualAbsent = manualAbsent;
     }
+
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
 }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -580,6 +580,9 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
                         predicates.add(cb.and(sub));
                     }
                 }
+                if (query.getStudentId() != null) {
+                    predicates.add(cb.equal(root.get("id"), query.getStudentId()));
+                }
                 return predicates.isEmpty() ? cb.conjunction()
                         : cb.and(predicates.toArray(new Predicate[predicates.size()]));
             }

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/query/MarkLibrarySearchQuery.java

@@ -17,7 +17,7 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
 
     private int campusId;
 
-    private int studentId;
+    private Integer studentId;
 
     private String examNumber;
 
@@ -61,11 +61,11 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
         this.subjectName = subjectName;
     }
 
-    public int getStudentId() {
+    public Integer getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(int studentId) {
+    public void setStudentId(Integer studentId) {
         this.studentId = studentId;
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkLibraryServiceImpl.java

@@ -202,7 +202,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                 if (StringUtils.isNotBlank(query.getExamNumber())) {
                     predicates.add(cb.equal(root.get("examNumber"), query.getExamNumber()));
                 }
-                if (query.getStudentId() > 0) {
+                if (query.getStudentId() != null) {
                     predicates.add(cb.equal(root.get("studentId"), query.getStudentId()));
                 }
                 if (query.getMarkerId() > 0) {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/TaskServiceImpl.java

@@ -102,7 +102,7 @@ public class TaskServiceImpl implements TaskService, ApplicationContextAware, In
         Task task = new Task();
         task.setTagList(getMarkSpecialTagList(library.getId()));
         task.setExist(true);
-        task.setStudentId(library.getExamNumber());
+        task.setStudentId(library.getStudentId().toString());
         task.setLibraryId(library.getId());
         task.setMarkStepList(buildMarkStep(library));
         task.setPictureUrls(PictureUrlBuilder.getSliceUrls(library.getExamId(), library.getCampusId(),

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/scoreList.jsp

@@ -72,7 +72,10 @@
 			<input  type="text" number="true" id="startScroe"  name="startScroe"value="${query.startScroe}" class="input-mini"/>
 			<label> 到&nbsp;&nbsp;&nbsp;</label>
 			<input type="text"  number="true" id="endScroe" name="endScroe"  value="${query.endScroe}"  class="input-mini"/>
-
+			&nbsp;
+			<label>考生编号</label>
+            <input type="text" name="studentId" id="studentId" value="${query.studentId}" maxlength="10" class="input-small"onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+            &nbsp;
             <div style="float: right;">
                 <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
                 &nbsp;
@@ -105,6 +108,7 @@
 		<thead>
 			<tr>
 				<th>准考证号</th>
+				<th>考生编号</th>
 				<th>姓名</th>
 				<th>学号</th>
 				<th>科目</th>
@@ -128,6 +132,7 @@
 				<td>
 				<a href="##" class="detail-link" data-exam-number="${student.examNumber}">${student.examNumber}</a>
 				</td>
+				<td>${student.id}</td>
 				<td>${student.name}</td>
 				<td>${student.studentCode}</td>
 				<td>${student.subjectCode}-${student.subjectName}&nbsp;${student.subjectRemark}</td>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/tagInfo.jsp

@@ -33,6 +33,9 @@
 				</c:forEach>
 			</select>
 			&nbsp;
+			<label>考生编号</label>
+            <input type="text" name="studentId" id="studentId" value="${query.studentId}" maxlength="10" class="input-small"onkeyup="this.value=this.value.replace(/\D/g,'')"/>
+            &nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 		</div>
 	</form>
@@ -43,6 +46,7 @@
 				<th>科目</th>
 				<th>学习中心</th>
 				<th>准考证号</th>
+				<th>考生编号</th>
 				<th>姓名</th>
 				<th>提交时间</th>
 				<th>操作</th>
@@ -54,6 +58,7 @@
 				<td>${result.subjectCode}-${result.subjectName}</td>
 				<td>${result.campusName}</td>
 				<td>${result.examNumber}</td>
+				<td>${result.id}</td>
 				<td>${result.name}</td>
 				<td>${result.markTime}</td>
 				<td>