fixbugs

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

@@ -128,12 +128,15 @@ public class LibraryController extends BaseExamController {
                         group.getSubjectCode(), false, group.getNumber()));
             }
         }
-        MarkLibrarySearchQuery query2 = new MarkLibrarySearchQuery();
-        query2.setExamId(examId);
-        query2.setSubjectCode(query.getSubjectCode());
-        query2.setGroupNumber(query.getGroupNumber());
-        query2.addStatus(LibraryStatus.MARKED);
-        long inspectedCount = libraryService.countByQuery(query2);
+        if (query.getGroupNumber() != 0) {
+            MarkLibrarySearchQuery query2 = new MarkLibrarySearchQuery();
+            query2.setExamId(examId);
+            query2.setSubjectCode(query.getSubjectCode());
+            query2.setGroupNumber(query.getGroupNumber());
+            query2.addStatus(LibraryStatus.MARKED);
+            long inspectedCount = libraryService.countByQuery(query2);
+            model.addAttribute("inspectedCount", inspectedCount);
+        }
         model.addAttribute("query", query);
         model.addAttribute("subjectList", getExamSubject(examId, wu));
         model.addAttribute("groupList", groupList);
@@ -145,7 +148,6 @@ public class LibraryController extends BaseExamController {
             marker.setLoginName(userService.findById(marker.getUserId()).getLoginName());
         }
         model.addAttribute("markerList", markerList);
-        model.addAttribute("inspectedCount", inspectedCount);
         Exam exam = examService.findById(examId);
         model.addAttribute("examType", exam.getType());
         return "modules/exam/libraryList";

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

@@ -93,7 +93,7 @@ public class MarkTrackController extends BaseExamController {
                 list.add(dto);
             }
             map.accumulate("tagList", list);
-            map.accumulate("secretNumber", student.getSecretNumber());
+            map.accumulate("examNumber", student.getExamNumber());
         }
         return map;
     }

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

@@ -99,7 +99,6 @@
             </td>
             <td>${result.inspectTime}</td>
             <td>
-                <a href="${ctx}/admin/exam/track/student/${result.id}" target="_blank">轨迹图</a>
                 <c:if test="${result.subjectiveStatus=='MARKED'}">
 	                <a target="_blank" href="${ctx}/web/admin/exam/inspected/start?studentId=${result.id}">进入复核</a>
                 </c:if>

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

@@ -66,7 +66,7 @@
           
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
         &nbsp;
-        <c:if test="${examType!='MULTI_MEDIA'}">
+        <c:if test="${examType!='MULTI_MEDIA' && inspectedCount!=null}">
             <a target="_blank" href="${ctx}/web/admin/exam/library/inspected/start?subjectCode=${query.subjectCode}&groupNumber=${query.groupNumber}" class="btn">待复核：${inspectedCount }</a>
         </c:if>
     </div>