fix

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

@@ -154,9 +154,9 @@ public class MarkQualityController extends BaseApiController {
         }
         for (Marker m : ms) {
             SubjectQualityVo vo = map.get(m.getSubjectCode());
-            vo.setFinishCount(vo.getFinishCount() + m.getFinishCount());
-            vo.setFinishCountNa(vo.getFinishCountNa() + m.getFinishCountNa());
-            vo.setWaitArbitrateCount(vo.getWaitArbitrateCount() + m.getWaitArbitrateCount());
+            vo.setFinishCount(add(vo.getFinishCount(), m.getFinishCount()));
+            vo.setFinishCountNa(add(vo.getFinishCountNa(), m.getFinishCountNa()));
+            vo.setWaitArbitrateCount(add(vo.getWaitArbitrateCount(), m.getWaitArbitrateCount()));
             vo.setArbitrateCount(vo.getFinishCount() - vo.getFinishCountNa());
             vo.setFinishArbitrateCount(vo.getArbitrateCount() - vo.getWaitArbitrateCount());
             if (vo.getFinishCount() == 0) {
@@ -167,6 +167,16 @@ public class MarkQualityController extends BaseApiController {
         }
     }
 
+    private int add(Integer n1, Integer n2) {
+        if (n1 == null) {
+            n1 = 0;
+        }
+        if (n2 == null) {
+            n2 = 0;
+        }
+        return n1 + n2;
+    }
+
     private void fillTotalCount(List<SubjectQualityVo> ret, List<MarkGroup> gs) {
         Map<String, SubjectQualityVo> map = new HashMap<>();
         for (SubjectQualityVo vo : ret) {

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

@@ -90,12 +90,14 @@ public class ScoreController extends BaseApiController {
         ApiUser wu = getApiUser();
         int examId = getSessionExamId();
         query.setExamId(examId);
-        if (filter == 1) {
-            query.setObjectiveScore(0d);
-            query.setSubjectiveScoreGt(0d);
-        } else if (filter == 2) {
-            query.setObjectiveScoreGt(0d);
-            query.setSubjectiveScore(0d);
+        if (filter != null) {
+            if (filter == 1) {
+                query.setObjectiveScore(0d);
+                query.setSubjectiveScoreGt(0d);
+            } else if (filter == 2) {
+                query.setObjectiveScoreGt(0d);
+                query.setSubjectiveScore(0d);
+            }
         }
         if ((wu.isSubjectHeader() || wu.isSchoolViewer()) && StringUtils.isBlank(query.getSubjectCode())) {
             query.setSubjectCodes(new ArrayList<>(wu.getSubjectCodeSet()));
@@ -138,11 +140,13 @@ public class ScoreController extends BaseApiController {
         if (StringUtils.isNotBlank(query.getSubjectCode())) {
             builder.append("科目代码:").append(query.getSubjectCode()).append(";");
         }
-        if (filter == 1) {
-            builder.append("客观0分，主观有分").append(";");
-        }
-        if (filter == 2) {
-            builder.append("客观有分，主观0分").append(";");
+        if (filter != null) {
+            if (filter == 1) {
+                builder.append("客观0分，主观有分").append(";");
+            }
+            if (filter == 2) {
+                builder.append("客观有分，主观0分").append(";");
+            }
         }
         if (query.getAbsent() != null) {
             builder.append("缺考:").append(query.getAbsent() ? "缺考" : "正常").append(";");

stmms-web/src/main/java/cn/com/qmth/stmms/common/support/CustomExceptionHandler.java

@@ -30,6 +30,7 @@ public class CustomExceptionHandler {
     @ExceptionHandler(Exception.class)
     public ResponseEntity<StatusResponse> handleException(Exception e, HttpServletRequest request) {
         StatusResponse body = null;
+
         if (e instanceof MethodArgumentNotValidException) {
             MethodArgumentNotValidException se = (MethodArgumentNotValidException) e;
             StringBuilder sb = new StringBuilder();
@@ -39,7 +40,7 @@ public class CustomExceptionHandler {
             }
             body = new StatusResponse(500, sb.toString());
         } else {
-            body = new StatusResponse(500, "系统异常");
+            body = new StatusResponse(500, e.getMessage());
             log.error(e.getMessage(), e);
         }
         return asResult(e, body, request);
@@ -60,7 +61,7 @@ public class CustomExceptionHandler {
             return asResultApiEx(e, body, request);
         } else {
             log.error(e.getMessage(), e);
-            body = new StatusResponse(500, "系统异常");
+            body = new StatusResponse(500, e.getMessage());
         }
 
         return asResult(e, body, request);