全卷复核

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

@@ -68,7 +68,7 @@ public class InspectHistoryServiceImpl extends BaseQueryService<InspectHistory>
 	public List<InspectHistory> findByStudentIdIn(List<Integer> sids) {
 		StringBuilder sql = new StringBuilder();
 		sql.append(
-				"select t.id,t.exam_id examId,t.inspect_time inspectTime,t.inspector_id inspectorId,t.student_id studentId,t.subject_code subjectCode,t.inspect_round inspectRound,CONCAT(u.login_name, ' ', u.name) inspectorName "
+				"select t.id,t.exam_id examId,t.inspect_time inspectTime,t.inspector_id inspectorId,t.student_id studentId,t.subject_code subjectCode,t.inspect_round inspectRound,CONCAT(u.login_name, '/', u.name) inspectorName "
 		+"from eb_inspect_history t  left join b_user u on t.inspector_id=u.id ");
 		sql.append("where t.student_id in(" + StringUtils.join(sids, ",")+")");
 		Query query = entityManager.createNativeQuery(sql.toString());

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

@@ -43,6 +43,7 @@ import cn.com.qmth.stmms.biz.mark.query.MarkLibrarySearchQuery;
 import cn.com.qmth.stmms.biz.mark.service.MarkLibraryService;
 import cn.com.qmth.stmms.biz.mark.service.MarkService;
 import cn.com.qmth.stmms.biz.mark.service.TaskService;
+import cn.com.qmth.stmms.biz.user.model.User;
 import cn.com.qmth.stmms.biz.user.service.UserService;
 import cn.com.qmth.stmms.common.annotation.Logging;
 import cn.com.qmth.stmms.common.annotation.RoleRequire;
@@ -122,6 +123,10 @@ public class LibraryController extends BaseExamController {
                 if (library.getMarkerId() != null) {
                     Marker marker = markerService.findById(library.getMarkerId());
                     library.setMarkerLoginName(userService.findById(marker.getUserId()).getLoginName());
+                    if(library.getHeaderId()!=null) {
+                    	User header=userService.findById(library.getHeaderId());
+                    	library.setHeaderLoginName(header.getLoginName()+"/"+header.getName());
+                    }
                 }
             }
             for (MarkGroup group : groupList) {

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

@@ -101,7 +101,6 @@
     <tr>
         <th><input type="checkbox" id="ids">科目</th>
         <th>密号</th>
-        <th>状态</th>
         <th>客观分</th>
         <th>主观分</th>
         <th>试卷总分</th>
@@ -118,7 +117,6 @@
         <tr>
             <td><input type="checkbox" class="ids" name="ids" value="${result.id}">${result.subjectCode}-${result.subjectName}</td>
             <td>${result.secretNumber}</td>
-            <td>${result.subjectiveStatus.name}</td>
             <td>${result.objectiveScoreString}</td>
             <td>${result.subjectiveScoreString}</td>
             <td><fmt:formatNumber pattern="###.###" value="${result.totalScore}"/></td>
@@ -341,6 +339,10 @@
     		 alert('请选择科目');
     		 return;
     	}
+    	if (!confirm('系统将生成新的复核任务，是否确认？')) {
+            return;
+        }
+    	
         $("#cancelForm").attr('target', "_self");
         $("#cancelForm").attr('action', '${ctx}/admin/exam/inspected/nextround?subjectCode='+subjectCode);
         $("#cancelForm").submit();

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

@@ -182,6 +182,8 @@
         <th>评卷总分</th>
         <th>给分明细</th>
         <th>评卷时间</th>
+        <th>复核人</th>
+        <th>复核时间</th>
         <th>操作</th>
     </tr>
     </thead>
@@ -231,6 +233,15 @@
                     &nbsp;
                 </c:if>
             </td>
+            <td> ${result.headerLoginName} </td>
+	            		<td>
+			            	<c:if test="${result.headerTime!=null}">
+			                    <fmt:formatDate value="${result.headerTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
+			                </c:if>
+			                <c:if test="${result.headerTime==null}">
+			                    &nbsp;
+			                </c:if>
+			            </td>
             <td>
                 <c:if test="${result.status.value==1 || result.status.value==3 ||result.status.value==5 ||result.status.value==6}">
                    <%--  <c:if test="${examType=='MULTI_MEDIA'}">