评卷员详情改为已评卷的科目包含已解绑的科目

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

@@ -247,10 +247,12 @@ public class MarkController extends BaseParameterController {
             if(subjectCode!=null){//科组长
             	query.setSubjectCode(subjectCode);
             }
-            query = libraryService.findByQuery(query);
+            query = libraryService.findGroupByQuery(query);
             for (MarkLibrary library : query.getResult()) {
-            	Marker marker = markerService.findById(library.getMarkerId());
-            	result.add(getMarkerInfoDTO(library.getSubjectCode(), marker));
+            	if(null!=library.getMarkerId()){
+            		Marker marker = markerService.findById(library.getMarkerId());
+            		result.add(getMarkerInfoDTO(library.getSubjectCode(), marker));
+            	}
             }
             try {
                 String fileName = "评卷员工作量" + DateUtils.getDate("yyyyMMdd") + ".xlsx";

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

@@ -19,6 +19,7 @@ import cn.com.qmth.stmms.biz.exam.model.MarkerDTO;
 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.mark.model.MarkLibrary;
 import cn.com.qmth.stmms.biz.mark.query.MarkLibrarySearchQuery;
 import cn.com.qmth.stmms.biz.mark.service.MarkLibraryService;
 import cn.com.qmth.stmms.common.enums.LibraryStatus;
@@ -77,6 +78,7 @@ public class ExamMarkerInfoController extends BaseParameterController {
         if (examId > 0) {
         	String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
             query.setStatus(LibraryStatus.MARKED);
+            query.setExamId(examId);
             if (markerId != null) {
                 query.setMarkerId(markerId);
             }
@@ -91,20 +93,13 @@ public class ExamMarkerInfoController extends BaseParameterController {
             }
             List<MarkerDTO> MarkerDTOs = new ArrayList<MarkerDTO>();
             if (examSubjects != null && examSubjects.size() > 0) {
-                // query = markLibraryService.findGroupByQuery(query);
                // query = markLibraryService.getByCondition(query);
-            	if(subjectCode!=null){
-            		MarkerSearchQuery query2 = new MarkerSearchQuery();
-            		query2.setPageNumber(1);
-            		query2.setPageSize(Integer.MAX_VALUE);
-            		query2.setExamId(examId);
-            		query2.orderById();
-            		query2.setSubjectCode(subjectCode);
-                    query2 = markerService.findByQuery(query2);
-            		for (Marker marker: query2.getResult()) {
-            			if(markerId.equals(marker.getId())){
-            				MarkerDTO markerDTO = getDTO(markerId, examSubjects.get(0));
-            				MarkerDTOs.add(markerDTO);
+            	if(!StringUtils.isEmpty(query.getSubjectCode())||subjectCode!=null){
+            		query = markLibraryService.findGroupByQuery(query);
+            		for ( MarkLibrary library: query.getResult()) {
+            			if(null!=library.getMarkerId()){
+	            			MarkerDTO markerDTO = getDTO(library.getMarkerId(), examSubjects.get(0));
+	            			MarkerDTOs.add(markerDTO);
             			}
             		}
             	}else{