|
@@ -184,7 +184,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 String subjectCode,@RequestParam(required = false)Double range) {
|
|
|
int examId = getSessionExamId(request);
|
|
|
Set<String> subjectSet = new HashSet<String>();
|
|
|
if (!lockService.isLocked(LockType.SCORE_CALCULATE, examId, subjectCode)) {
|
|
@@ -196,7 +196,7 @@ public class ReportSubjectRangeController extends BaseExamController {
|
|
|
ScoreReportThread thread = new ScoreReportThread(map, reportService, false);
|
|
|
taskExecutor.submit(thread);
|
|
|
}
|
|
|
- return "redirect:/admin/exam/reportSubjectRange?subjectCode=" + subjectCode;
|
|
|
+ return "redirect:/admin/exam/reportSubjectRange?subjectCode=" + subjectCode+"&range="+range;
|
|
|
}
|
|
|
|
|
|
private JSONArray getScoreRange(String scoreRange, double totalScore, Integer totalCount, double range) {
|