修复单科目导出验证

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

@@ -126,9 +126,9 @@ public class ScoreController extends BaseExamController {
             buildPackageUrl(student);
             buildAnswerUrl(student);
         }
-        String exporMmessage = enableExport(examId);
-        if (exporMmessage != null) {
-            view.addObject("exporMmessage", exporMmessage);
+        String exportMessage = enableExport(examId);
+        if (exportMessage != null) {
+            view.addObject("exportMessage", exportMessage);
             view.addObject("enableExport", false);
         } else {
             view.addObject("enableExport", true);
@@ -267,12 +267,18 @@ public class ScoreController extends BaseExamController {
     public JSONObject query(HttpServletRequest request, @RequestParam(required = false) String subjectCode) {
         int examId = getSessionExamId(request);
         JSONObject obj = new JSONObject();
-        String exporMmessage = isChecked(examId);
-        if(exporMmessage ==null && StringUtils.isNotBlank(subjectCode)){
-            exporMmessage = enableExport(examId, subjectCode);
+        String exportMessage = null;
+        if(StringUtils.isNotBlank(subjectCode)){
+            exportMessage = enableExport(examId, subjectCode);
+        }else{
+            exportMessage = enableExport(examId);
+        }
+        if (exportMessage != null) {
+            obj.accumulate("enableExport", false);
+            obj.accumulate("exportMessage", exportMessage);
+        } else {
+            obj.accumulate("enableExport", true);
         }
-        obj.accumulate("enableExport", exporMmessage==null);
-        obj.accumulate("exporMmessage", exporMmessage);
         return obj;
     }
 
@@ -373,10 +379,12 @@ public class ScoreController extends BaseExamController {
     }
     
     private String enableExport(int examId,String subjectCode) {
-        String message = null;
-        List<MarkGroup> groups = groupService.findByExamAndSubjectAndStatus(examId, subjectCode, MarkStatus.FORMAL,MarkStatus.TRIAL);
-        if(groups!=null && !groups.isEmpty()){
-            message = subjectCode+" 科目未评卷完成";
+        String message = isChecked(examId);
+        if(message==null){
+            List<MarkGroup> groups = groupService.findByExamAndSubjectAndStatus(examId, subjectCode, MarkStatus.FORMAL,MarkStatus.TRIAL);
+            if(groups!=null && !groups.isEmpty()){
+                message = subjectCode+" 科目未评卷完成";
+            }
         }
         return message;
     }

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

@@ -59,7 +59,7 @@
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 			&nbsp;
 			<c:if test="${!web_user.schoolViewer }">
-			<input id="export-button" class="btn" type="button" value="导出" onclick="goExport()"<c:if test="${!enableExport}">disabled="ture"</c:if> title="${exporMmessage}"/>
+			<input id="export-button" class="btn" type="button" value="导出" onclick="goExport()"<c:if test="${!enableExport}">disabled="ture"</c:if> title="${exportMessage}"/>
 			</c:if>
 			<c:if test="${web_user.schoolAdmin}">
 			&nbsp;
@@ -237,9 +237,10 @@ $('#subject-select').change(function(){
     $.post('${ctx}/admin/exam/score/enableExport', {subjectCode: code}, function(result){
         if(result.enableExport){
         	$("#export-button").removeAttr("disabled");
+        	$("#export-button").removeAttr("title");
         }else{
 	        $("#export-button").attr("disabled","disabled");
-        	$("#export-button").attr("title",result.exporMmessage);
+        	$("#export-button").attr("title",result.exportMessage);
         }
     });
 });