修复接口取客观题成绩，接口新增考点属性，其他bug修复

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/CoreController.java

@@ -298,57 +298,59 @@ public class CoreController extends BaseApiController {
             obj.accumulate("college", student.getCollege());
             obj.accumulate("teacher", student.getTeacher());
             obj.accumulate("status", getStatus(student));
-            obj.accumulate("totalScore", df.format(student.getTotalScore()));
-            obj.accumulate("objectiveScore", df.format(student.getObjectiveScore()));
-            obj.accumulate("subjectiveScore", df.format(student.getSubjectiveScore()));
+            obj.accumulate("totalScore", getStatus(student) == 1 ? df.format(student.getTotalScore()) : 0);
+            obj.accumulate("objectiveScore", getStatus(student) == 1 ? df.format(student.getObjectiveScore()) : 0);
+            obj.accumulate("subjectiveScore", getStatus(student) == 1 ? df.format(student.getSubjectiveScore()) : 0);
             // obj.accumulate("objectiveScoreDetail",
             // StringUtils.trimToEmpty(student.getObjectiveScoreList()));
             // obj.accumulate("subjectiveScoreDetail",
             // StringUtils.trimToEmpty(student.getSubjectiveScoreList()));
-            // 构造客观题得分明细
             JSONArray objective = new JSONArray();
-            List<ScoreItem> scoreList = student.getScoreList(true);
-            List<ExamQuestion> questionList = questionService.findByExamAndSubjectAndObjectiveAndPaperType(
-                    student.getExamId(), student.getSubjectCode(), true, student.getPaperType());
-            int i = 0;
-            for (ScoreItem item : scoreList) {
-                i++;
-                if (questionList.size() < i) {
-                    break;
-                }
-                ExamQuestion question = questionList.get(i - 1);
-                if (question.getTotalScore() == null || question.getTotalScore() == 0) {
-                    continue;
-                }
-                JSONObject detail = new JSONObject();
-                detail.accumulate("mainNumber", question.getMainNumber());
-                detail.accumulate("subNumber", question.getSubNumber());
-                detail.accumulate("score", df.format(item.getScore()));
-                detail.accumulate("answer", StringUtils.trimToEmpty(item.getAnswer()));
-                objective.add(detail);
-            }
-            obj.accumulate("objectiveScoreDetail", objective);
-            // 构造主观题得分明细
             JSONArray subjective = new JSONArray();
-            scoreList = student.getScoreList(false);
-            questionList = questionService.findByExamAndSubjectAndObjective(student.getExamId(),
-                    student.getSubjectCode(), false);
-            i = 0;
-            for (ScoreItem item : scoreList) {
-                i++;
-                if (questionList.size() < i) {
-                    break;
+            if (getStatus(student) == 1) {
+                // 构造客观题得分明细
+                List<ScoreItem> scoreList = student.getScoreList(true);
+                List<ExamQuestion> questionList = questionService.findByExamAndSubjectAndObjectiveAndPaperType(
+                        student.getExamId(), student.getSubjectCode(), true, student.getPaperType());
+                int i = 0;
+                for (ScoreItem item : scoreList) {
+                    i++;
+                    if (questionList.size() < i) {
+                        break;
+                    }
+                    ExamQuestion question = questionList.get(i - 1);
+                    if (question.getTotalScore() == null || question.getTotalScore() == 0) {
+                        continue;
+                    }
+                    JSONObject detail = new JSONObject();
+                    detail.accumulate("mainNumber", question.getMainNumber());
+                    detail.accumulate("subNumber", question.getSubNumber());
+                    detail.accumulate("score", df.format(item.getScore()));
+                    detail.accumulate("answer", StringUtils.trimToEmpty(item.getAnswer()));
+                    objective.add(detail);
                 }
-                ExamQuestion question = questionList.get(i - 1);
-                if (question.getTotalScore() == null || question.getTotalScore() == 0) {
-                    continue;
+                // 构造主观题得分明细
+                scoreList = student.getScoreList(false);
+                questionList = questionService.findByExamAndSubjectAndObjective(student.getExamId(),
+                        student.getSubjectCode(), false);
+                i = 0;
+                for (ScoreItem item : scoreList) {
+                    i++;
+                    if (questionList.size() < i) {
+                        break;
+                    }
+                    ExamQuestion question = questionList.get(i - 1);
+                    if (question.getTotalScore() == null || question.getTotalScore() == 0) {
+                        continue;
+                    }
+                    JSONObject detail = new JSONObject();
+                    detail.accumulate("mainNumber", question.getMainNumber());
+                    detail.accumulate("subNumber", question.getSubNumber());
+                    detail.accumulate("score", df.format(item.getScore()));
+                    subjective.add(detail);
                 }
-                JSONObject detail = new JSONObject();
-                detail.accumulate("mainNumber", question.getMainNumber());
-                detail.accumulate("subNumber", question.getSubNumber());
-                detail.accumulate("score", df.format(item.getScore()));
-                subjective.add(detail);
             }
+            obj.accumulate("objectiveScoreDetail", objective);
             obj.accumulate("subjectiveScoreDetail", subjective);
             // 构造原图下载地址
             if (student.isUpload()) {

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamStudentController.java

@@ -74,6 +74,7 @@ public class ExamStudentController extends BaseApiController {
             obj.accumulate("studentId", String.valueOf(student.getId()));
             obj.accumulate("subjectCode", student.getSubjectCode());
             obj.accumulate("subjectName", student.getSubjectName());
+            obj.accumulate("examSite", student.getExamSite());
         } else {
             obj.accumulate("examId", examStudent.getExamId());
             obj.accumulate("campusCode", "");
@@ -83,6 +84,7 @@ public class ExamStudentController extends BaseApiController {
             obj.accumulate("studentId", "");
             obj.accumulate("subjectCode", "");
             obj.accumulate("subjectName", "");
+            obj.accumulate("examSite", "");
         }
         return obj;
     }

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ScanController.java

@@ -17,7 +17,6 @@ import cn.com.qmth.stmms.common.utils.RequestUtils;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,8 +40,6 @@ public class ScanController extends BaseApiController {
     @Autowired
     private CheckStudentService checkStudentService;
 
-    private static final String NULL_PAPER_TYPE_PLACEHOLDER = "#";
-
     private static final String PAPER_TYPES_REGEX = "[a-zA-Z#]";
 
     /**

stmms-web/src/main/java/cn/com/qmth/stmms/common/controller/BaseController.java

@@ -285,9 +285,11 @@ public class BaseController {
             }
         }
         calculateObjectiveScore(student);
-        if (!old.isAbsent() && student.isAbsent()) {// 正考转缺考
+        if (student.isAbsent()) {// 转缺考
             student.setObjectiveScore(0d);
             student.setObjectiveScoreList(null);
+        }
+        if (!old.isAbsent() && student.isAbsent()) {// 正考转缺考
             student.setSubjectiveScore(0d);
             student.setSubjectiveScoreList(null);
             studentService.save(student);

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/schoolList.jsp

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>评卷员管理</title>
+	<title>学校管理</title>
 	<meta name="decorator" content="default"/>
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
 	<style type="text/css">.sort{color:#0663A2;cursor:pointer;}</style>