yin 1 an în urmă
părinte
comite
d86c9c545c

+ 2 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

@@ -205,7 +205,7 @@ public class ReportSubjectRangeController extends BaseExamController {
     @RequestMapping("/report")
     @RequestMapping("/report")
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.COLLEGE_ADMIN })
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.COLLEGE_ADMIN })
     public String calculate(HttpServletRequest request, RedirectAttributes redirectAttributes,
     public String calculate(HttpServletRequest request, RedirectAttributes redirectAttributes,
-            @RequestParam String subjectCode, @RequestParam boolean objective) {
+            @RequestParam String subjectCode, @RequestParam Boolean objective) {
         int examId = getSessionExamId(request);
         int examId = getSessionExamId(request);
         Set<String> subjectSet = new HashSet<String>();
         Set<String> subjectSet = new HashSet<String>();
         if (!lockService.isLocked(LockType.SCORE_CALCULATE, examId, subjectCode)) {
         if (!lockService.isLocked(LockType.SCORE_CALCULATE, examId, subjectCode)) {
@@ -214,7 +214,7 @@ public class ReportSubjectRangeController extends BaseExamController {
         if (!subjectSet.isEmpty()) {
         if (!subjectSet.isEmpty()) {
             Map<Integer, Set<String>> map = new HashMap<Integer, Set<String>>();
             Map<Integer, Set<String>> map = new HashMap<Integer, Set<String>>();
             map.put(examId, subjectSet);
             map.put(examId, subjectSet);
-            if (objective) {
+            if (objective!=null && objective) {
                 ScoreReportObjectiveThread thread = new ScoreReportObjectiveThread(map, reportService, false);
                 ScoreReportObjectiveThread thread = new ScoreReportObjectiveThread(map, reportService, false);
                 taskExecutor.submit(thread);
                 taskExecutor.submit(thread);
             } else {
             } else {