导出评卷员工作量时导出所有评卷员

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

@@ -240,17 +240,15 @@ public class MarkController extends BaseParameterController {
             List<MarkerInfoDTO> result = new LinkedList<MarkerInfoDTO>();
             String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
             List<Marker> list = null;
+            MarkerSearchQuery query = new MarkerSearchQuery();
+            query.setExamId(examId);
+            query.setPageNumber(1);
+            query.setPageSize(Integer.MAX_VALUE);
+            query.orderById();
             if(subjectCode!=null){//科组长
-            	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);
+            	query.setSubjectCode(subjectCode);
             }
+            list = markerService.findByQuery(query).getResult();
             for (Marker marker : list) {
             	if(subjectCode!=null){//科组长
             		result.add(getMarkerInfoDTO(subjectCode, marker));

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

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -18,7 +19,6 @@ 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;
@@ -87,31 +87,34 @@ public class ExamMarkerInfoController extends BaseParameterController {
             List<ExamSubject> examSubjects = new ArrayList<ExamSubject>();
             if(subjectCode!=null){//科组长
             	examSubjects.add(examSubjectService.find(examId, subjectCode));
-            }else{
+            }else if (!StringUtils.isEmpty(query.getSubjectCode())) {
+            	examSubjects.add(examSubjectService.find(examId, query.getSubjectCode()));
+            } else{
             	examSubjects = examSubjectService.findExamSubjectByMarkerId(examId, markerId,
             			LibraryStatus.MARKED);
             }
             List<MarkerDTO> MarkerDTOs = new ArrayList<MarkerDTO>();
             if (examSubjects != null && examSubjects.size() > 0) {
                 // query = markLibraryService.findGroupByQuery(query);
-                query = markLibraryService.getByCondition(query);
-                for (MarkLibrary markLibrary : query.getResult()) {
+               // query = markLibraryService.getByCondition(query);
+                for (ExamSubject examSubject : examSubjects) {
                     MarkerDTO markerDTO = new MarkerDTO();
-                    markerDTO.setSubjectCode(markLibrary.getSubjectCode());
-                    for (ExamSubject examSubject : examSubjects) {
-                        if (markLibrary.getSubjectCode().equals(examSubject.getCode())) {
-                            markerDTO.setSubjectName(examSubject.getName());
-                        }
-                    }
+                    markerDTO.setSubjectCode(examSubject.getCode());
+                    markerDTO.setSubjectName(examSubject.getName());
                     markerDTO.setMarkedCount(
-                            getMarkedCountByCode(markerId, markLibrary.getSubjectCode(), LibraryStatus.MARKED));
+                            getMarkedCountByCode(markerId, examSubject.getCode(), LibraryStatus.MARKED));
                     // markerDTO.setRejectCount(getMarkedCountByCode(markerId,markLibrary.getSubjectCode(),LibraryStatus.BACKED));
                     MarkerDTOs.add(markerDTO);
                 }
             }
             model.addAttribute("query", query);
             model.addAttribute("MarkerDTOs", MarkerDTOs);
-            model.addAttribute("subjectList", examSubjects);
+            if(subjectCode!=null){
+            	model.addAttribute("subjectList", examSubjects);
+            }else{
+            	model.addAttribute("subjectList", examSubjectService.findExamSubjectByMarkerId(examId, markerId,
+            			LibraryStatus.MARKED));
+            }
             return "modules/exam/param/markerDetail";
         } else {
             return "redirect:/admin/exam/list";

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/subjectSelect.jsp

@@ -66,7 +66,7 @@
 						<div class="controls">
 							<select name="subjectCode" id="subject-select">
 							<c:forEach items="${subjectList}" var="subject">
-								<c:if test="${subject.subjectiveCount > 0}">
+								<c:if test="${subject.subjectiveScore > 0}">
 								<option value="${subject.code}" <c:if test="${subject.code==marker.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
 								</c:if>
 							</c:forEach>

stmms-web/src/main/webapp/WEB-INF/views/modules/mark/subjectSelectAp.jsp

@@ -66,7 +66,7 @@
 						<div class="controls">
 							<select name="subjectCode" id="subject-select">
 							<c:forEach items="${subjectList}" var="subject">
-								<c:if test="${subject.subjectiveCount > 0}">
+								<c:if test="${subject.subjectiveScore > 0}">
 								<option value="${subject.code}" <c:if test="${subject.code==marker.subjectCode}">selected</c:if>>${subject.code}-${subject.name}</option>
 								</c:if>
 							</c:forEach>