xiatian 1 jaar geleden
bovenliggende
commit
8d9ae2e0d1

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

@@ -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) {

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectRange.jsp

@@ -56,7 +56,7 @@
                data-i18n-value="report.group.search"/>
         <c:if test="${query.subjectCode!=null && oldSubjectCode!=null}">
             <a id="refresh"
-               href="<c:if test="${locked}">#</c:if><c:if test="${!locked}">${ctx}/admin/exam/reportSubjectRange/report?subjectCode=${query.subjectCode}</c:if>"
+               href="<c:if test="${locked}">#</c:if><c:if test="${!locked}">${ctx}/admin/exam/reportSubjectRange/report?subjectCode=${query.subjectCode}&range=${query.range}</c:if>"
                class="btn" <c:if test="${locked}">disabled="disabled"</c:if>>刷新</a>
         </c:if>
         &nbsp;