fix bugs

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkerController.java

@@ -489,6 +489,7 @@ public class MarkerController extends BaseExamController {
         query.setRole(Role.MARKER);
         query = userService.findByQuery(query);
         model.addAttribute("query", query);
+        model.addAttribute("subject", subjectService.find(examId, subjectCode));
         model.addAttribute("group", groupService.findOne(examId, subjectCode, groupNumber));
         return "modules/exam/markerSubject";
     }

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ScanController.java

@@ -81,7 +81,7 @@ public class ScanController extends BaseApiController {
                         if (sc.getPaperType().matches(PAPER_TYPES_REGEX)) {
                             student.setPaperType(sc.getPaperType());
                         } else {
-                            student.setPaperType(NULL_PAPER_TYPE_PLACEHOLDER);
+                            continue;
                         }
                     }
                     // 同步更新评卷任务

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

@@ -18,8 +18,8 @@
 	    <input type="hidden" class="hiddenField" id="examNumberIn" name="examNumberIn"/>
 	    <input type="hidden" class="hiddenField" id="subjectCodeIn" name="subjectCodeIn"/>
 	    <input type="hidden" class="hiddenField" id="subjectCodeNotIn" name="subjectCodeNotIn"/>
-	    <input type="hidden" class="hiddenField" id="campusNameIn" name="campusNameIn"/>
-        <input type="hidden" class="hiddenField" id="campusNameNotIn" name="campusNameNotIn"/>
+	   <!--  <input type="hidden" class="hiddenField" id="campusNameIn" name="campusNameIn"/>
+        <input type="hidden" class="hiddenField" id="campusNameNotIn" name="campusNameNotIn"/> -->
         <input type="hidden" class="hiddenField" id="objectiveScoreGt" name="objectiveScoreGt"/>
         <input type="hidden" class="hiddenField" id="objectiveScoreLt" name="objectiveScoreLt"/>
         <input type="hidden" class="hiddenField" id="objectiveScore" name="objectiveScore"/>
@@ -54,7 +54,7 @@
                 <textarea id="subjectCodeInput" rows="6" maxlength="10000" class="input-xxlarge" placeholder="多个科目代码用英文逗号分隔"></textarea>
             </div>
         </div>
-        <div class="control-group">
+<!--         <div class="control-group">
             <label class="control-label">学习中心</label>
             <div class="controls">
                 <select id="campusNameFunction" class="input-small">
@@ -64,7 +64,7 @@
                 <br/><br/>
                 <textarea id="campusNameInput" rows="6" maxlength="10000" class="input-xxlarge" placeholder="多个学习中心名称用英文逗号分隔"></textarea>
             </div>
-        </div>
+        </div> -->
         <div class="control-group">
             <label class="control-label">客观总分</label>
             <div class="controls">
@@ -109,7 +109,7 @@ $('#count-button').click(function(){
     $('.hiddenField').val('');
     check('examNumber');
     check('subjectCode');
-    check('campusName');
+   // check('campusName');
     check('objectiveScore');
     check('subjectiveScore');
     var paperType = $('#paperType').val();

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

@@ -31,13 +31,13 @@
 				<option value="${subject.code}" <c:if test="${subject.code==query.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
 				</c:forEach>
 			</select>
-			<label>学习中心</label>
+		<%-- 	<label>学习中心</label>
 			<select name="campusName">
 				<option value="">请选择</option>
 				<c:forEach items="${campusList}" var="campus">
 				<option value="${campus}" <c:if test="${campus==query.campusName}">selected</c:if>>${campus}</option>
 				</c:forEach>
-			</select>
+			</select> --%>
 			
 			<br><br>
 			
@@ -64,7 +64,7 @@
 				<th>姓名</th>
 				<th>学号</th>
 				<th>科目</th>
-				<th>学习中心</th>
+			<!-- 	<th>学习中心</th> -->
 				<th>扫描批次</th>
 				<th>上传时间</th>
 			</tr>
@@ -76,7 +76,7 @@
 				<td>${student.name}</td>
 				<td>${student.studentCode}</td>
 				<td>${student.subjectCode}-${student.subjectName}</td>
-				<td>${student.campusName}</td>
+			<%-- 	<td>${student.campusName}</td> --%>
 				<td>${student.batchCode}</td>
 				<td><fmt:formatDate value="${student.uploadTime}" pattern="yyyy-MM-dd hh:MM:ss"/></td>
 			</tr>

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

@@ -37,7 +37,6 @@
 				<th>姓名</th>
 				<th>学号</th>
 				<th>科目</th>
-				<th>学习中心</th>
 				<th>扫描批次</th>
 				<th>上传时间</th>
 			</tr>
@@ -49,7 +48,6 @@
 				<td>${student.name}</td>
 				<td>${student.studentCode}</td>
 				<td>${student.subjectCode}-${student.subjectName}</td>
-				<td>${student.campusName}</td>
 				<td>${student.batchCode}</td>
 				<td><fmt:formatDate value="${student.uploadTime}" pattern="yyyy-MM-dd hh:MM:ss"/></td>
 			</tr>

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

@@ -26,7 +26,7 @@
                 <span class="b">准考证：</span><span class="i" id="examNumber"></span><span class="pipe">|</span>
                 <span class="b">学号：</span><span class="i" id="studentCode"></span><span class="pipe">|</span>
                 <span class="b">科目：</span><span class="i" id="subject"></span><span class="pipe">|</span>
-                <span class="b">学习中心：</span><span class="i" id="campusName"></span><span class="pipe">|</span>
+           <!--      <span class="b">学习中心：</span><span class="i" id="campusName"></span><span class="pipe">|</span> -->
                 <span class="b">客观总分：</span><span class="i r" id="objectiveScore"></span><span class="pipe">|</span>
                 <span class="b">主观总分：</span><span class="i r" id="subjectiveScore"></span>
             </div>
@@ -160,7 +160,7 @@
         $('#examNumber').html(student.examNumber);
         $('#studentCode').html(student.studentCode);
         $('#subject').html(student.subjectCode + '_' + student.subjectName);
-        $('#campusName').html(student.campusName);
+        //$('#campusName').html(student.campusName);
         $('#objectiveScore').html(student.objectiveScore);
         $('#subjectiveScore').html(student.subjectiveScore);
 

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

@@ -65,7 +65,7 @@
         <th>考生编号</th>
         <th>状态</th>
         <th>试卷总分</th>
-        <th>大题得分明细</th>
+        <th>得分明细</th>
         <th>复核时间</th>
         <th>操作</th>
     </tr>

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

@@ -60,11 +60,11 @@
         <input type="text" number="true" id="endScore" name="endScore" value="${query.endScore}" class="input-mini"/>
         
         <label>学院</label>
-        <input type="text" name="college" value="${query.college}" maxlength="10" class="input-mini"/>
+        <input type="text" name="college" value="${query.college}" maxlength="64" class="input-mini"/>
         <label>班级</label>
-        <input type="text" name="className" value="${query.className}" maxlength="10" class="input-mini"/>
+        <input type="text" name="className" value="${query.className}" maxlength="64" class="input-mini"/>
         <label>任课老师</label>
-        <input type="text" name="teacher" value="${query.teacher}" maxlength="10" class="input-mini"/>
+        <input type="text" name="teacher" value="${query.teacher}" maxlength="64" class="input-mini"/>
         
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
         &nbsp;

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

@@ -76,7 +76,7 @@
             submitHandler: function (form) {
                 //alert("studentId="+$("#studentId").val()+" subjectCode="+$("#subjectCode").val());
                 $("#subjectCode").removeAttr("disabled");
-                $("#campusName").removeAttr("disabled");
+               // $("#campusName").removeAttr("disabled");
                 loading('正在提交，请稍等...');
                 form.submit();
             },

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubject.jsp

@@ -19,6 +19,7 @@
 	    <div>
 	        <label data-i18n-text="report.subject.name">科目</label>
 	        <select class="input-large" id="subjectCode" name="subjectCode">
+		        <option value="">请选择</option>
 	            <c:forEach items="${subjectList }" var="subject">
 	                <option value="${subject.code }"
 	                        <c:if test="${query.subjectCode eq subject.code }">selected</c:if>>${subject.code}-${subject.name}</option>
@@ -49,7 +50,9 @@
 		<tbody>
 		<c:forEach items="${list}" var="reportSubject">
 			<tr>
-				<td><a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${reportSubject.subjectCode}">${reportSubject.subjectCode}-${reportSubject.subjectName}</a></td>
+				<td>${reportSubject.subjectCode}-${reportSubject.subjectName}
+				<%-- <a href="${ctx}/admin/exam/reportSubjectCollege?subjectCode=${reportSubject.subjectCode}">${reportSubject.subjectCode}-${reportSubject.subjectName}</a> --%>
+				</td>
 				<td>${reportSubject.totalCount}</td>
 				<td>${reportSubject.absentCount}</td>
 				<td>${reportSubject.breachCount}</td>

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectTeacherClass.jsp

@@ -21,7 +21,7 @@
 <form id="searchForm" action="${ctx}/admin/exam/reportSubjectTeacher" method="post" class="breadcrumb form-search">
 		<input type="hidden" id="teacherName" name="teacherName" value="${query.teacherName }"/>
 		<input type="hidden" id="subjectCode" name="subjectCode" value="${query.subjectCode }"/>
-    &nbsp;&nbsp;科目：${subjectName}&nbsp;&nbsp;&nbsp;&nbsp;
+    &nbsp;&nbsp;<span data-i18n-text="report.teacher.subject">科目</span>：${subjectName}&nbsp;&nbsp;&nbsp;&nbsp;
     <span data-i18n-text="report.teacher.name">任课老师</span>：${query.teacherName} &nbsp;&nbsp;
     <a href="#" class="btn btn-primary" onclick="viewTeacherClassEcharts()" data-i18n-text="report.teacher.chart">查看统计图</a>
     &nbsp;