fix

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/MarkerInfoDTO.java

@@ -26,7 +26,6 @@ public class MarkerInfoDTO {
         setSubjectName(subject.getName());
         setLoginName(marker.getLoginName());
         setName(marker.getName());
-        setMarkedCount(marker.getMarkedCount());
     }
 
     public String getSubjectCode() {

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

@@ -27,6 +27,7 @@ import cn.com.qmth.stmms.admin.exam.parameter.BaseParameterController;
 import cn.com.qmth.stmms.admin.vo.SubjectLibraryVO;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.Marker;
+import cn.com.qmth.stmms.biz.exam.query.MarkerSearchQuery;
 import cn.com.qmth.stmms.biz.exam.service.ExamSubjectService;
 import cn.com.qmth.stmms.biz.exam.service.MarkerService;
 import cn.com.qmth.stmms.biz.exam.service.query.ExamSubjectSearchQuery;
@@ -240,20 +241,22 @@ public class MarkController extends BaseParameterController {
             String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
             List<Marker> list = null;
             if(subjectCode!=null){//科组长
-            	list = markerService.findByExamAndSubject(examId, subjectCode);
+            	MarkerSearchQuery query = new MarkerSearchQuery();
+            	query.setExamId(examId);
+                query.setSubjectCode(subjectCode);
+                query.setPageNumber(1);
+                query.setPageSize(Integer.MAX_VALUE);
+                query.orderById();
+            	list = markerService.findByQuery(query).getResult();
             }else{
             	list = markerService.getMarkCount(examId);
             }
             for (Marker marker : list) {
             	if(subjectCode!=null){//科组长
-            		MarkerInfoDTO dto = new MarkerInfoDTO(marker,
-        					subjectService.find(marker.getExamId(), subjectCode));
-        			result.add(dto);
+            		result.add(getMarkerInfoDTO(subjectCode, marker));
             	}else{
             		for (ExamSubject subject : marker.getExamSubjects()) {
-            			MarkerInfoDTO dto = new MarkerInfoDTO(marker,
-            					subjectService.find(marker.getExamId(), subject.getCode()));
-            			result.add(dto);
+            			result.add(getMarkerInfoDTO(subject.getCode(), marker));
             		}
             	}
             }
@@ -271,6 +274,18 @@ public class MarkController extends BaseParameterController {
         }
     }
 
+	private MarkerInfoDTO getMarkerInfoDTO(String subjectCode, Marker marker) {
+		MarkerInfoDTO dto = new MarkerInfoDTO(marker,subjectService.find(marker.getExamId(), subjectCode));
+		MarkLibrarySearchQuery query2 = new MarkLibrarySearchQuery();
+		query2.setExamId(marker.getExamId());
+		query2.setSubjectCode(subjectCode);
+		query2.setStatus(LibraryStatus.MARKED);
+		query2.setMarkerId(marker.getId());
+		libraryService.countByQuery(query2);
+		dto.setMarkedCount(libraryService.countByQuery(query2));
+		return dto;
+	}
+
     @RequestMapping(value = "/check-count")
     public String checkCount(HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {