fix

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

@@ -94,21 +94,22 @@ public class ExamMarkerInfoController extends BaseParameterController {
             			LibraryStatus.MARKED);
             }
             List<MarkerDTO> MarkerDTOs = new ArrayList<MarkerDTO>();
-            Marker marker = markerService.findById(markerId);
             if (examSubjects != null && examSubjects.size() > 0) {
                 // query = markLibraryService.findGroupByQuery(query);
                // query = markLibraryService.getByCondition(query);
-                for (ExamSubject examSubject : examSubjects) {
-                	if(marker.getExamSubjects().contains(examSubject)){
-                		MarkerDTO markerDTO = new MarkerDTO();
-                		markerDTO.setSubjectCode(examSubject.getCode());
-                		markerDTO.setSubjectName(examSubject.getName());
-                		markerDTO.setMarkedCount(
-                				getMarkedCountByCode(markerId, examSubject.getCode(), LibraryStatus.MARKED));
-                		// markerDTO.setRejectCount(getMarkedCountByCode(markerId,markLibrary.getSubjectCode(),LibraryStatus.BACKED));
-                		MarkerDTOs.add(markerDTO);
-                	}
-                }
+            	if(subjectCode!=null){
+            		for (Marker marker: examSubjects.get(0).getMarkers()) {
+            			if(markerId.equals(marker.getId())){
+            				MarkerDTO markerDTO = getDTO(markerId, examSubjects.get(0));
+            				MarkerDTOs.add(markerDTO);
+            			}
+            		}
+            	}else{
+            		for (ExamSubject examSubject : examSubjects) {
+            			MarkerDTO markerDTO = getDTO(markerId, examSubject);
+            			MarkerDTOs.add(markerDTO);
+            		}
+            	}
             }
             model.addAttribute("query", query);
             model.addAttribute("MarkerDTOs", MarkerDTOs);
@@ -124,6 +125,15 @@ public class ExamMarkerInfoController extends BaseParameterController {
         }
     }
 
+	private MarkerDTO getDTO(Integer markerId, ExamSubject examSubject) {
+		MarkerDTO markerDTO = new MarkerDTO();
+		markerDTO.setSubjectCode(examSubject.getCode());
+		markerDTO.setSubjectName(examSubject.getName());
+		markerDTO.setMarkedCount(getMarkedCountByCode(markerId, examSubject.getCode(), LibraryStatus.MARKED));
+		// markerDTO.setRejectCount(getMarkedCountByCode(markerId,markLibrary.getSubjectCode(),LibraryStatus.BACKED));
+		return markerDTO;
+	}
+
 //    public long getSubjectCountByExamId(int examId) {
 //        return examSubjectService.count(examId);
 //    }