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