xiatian 1 year ago
parent
commit
e04b6dc292

+ 5 - 5
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/InspectedController.java

@@ -339,10 +339,10 @@ public class InspectedController extends BaseExamController {
         ExamSubject es = subjectService.find(examId, subjectCode);
         ExamSubject es = subjectService.find(examId, subjectCode);
         if (!inspectedService.inspectFinish(examId, subjectCode, es.getInspectRound())) {
         if (!inspectedService.inspectFinish(examId, subjectCode, es.getInspectRound())) {
             ra.addFlashAttribute("errmsg", "该科目第" + es.getInspectRound() + "次复核还未完成");
             ra.addFlashAttribute("errmsg", "该科目第" + es.getInspectRound() + "次复核还未完成");
-            return "redirect:/admin/exam/inspected/list?subjectCode=" + subjectCode;
+            return "redirect:/admin/exam/inspected/list";
         }
         }
         subjectService.nextInspectRound(examId, subjectCode);
         subjectService.nextInspectRound(examId, subjectCode);
-        return "redirect:/admin/exam/inspected/list?subjectCode=" + subjectCode;
+        return "redirect:/admin/exam/inspected/list";
     }
     }
 
 
     @Logging(menu = "打回", type = LogType.UPDATE)
     @Logging(menu = "打回", type = LogType.UPDATE)
@@ -493,10 +493,10 @@ public class InspectedController extends BaseExamController {
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.COLLEGE_ADMIN })
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER, Role.INSPECTOR, Role.COLLEGE_ADMIN })
     public String batchCancel(HttpServletRequest request, @RequestParam Integer[] ids) {
     public String batchCancel(HttpServletRequest request, @RequestParam Integer[] ids) {
         WebUser wu = RequestUtils.getWebUser(request);
         WebUser wu = RequestUtils.getWebUser(request);
-        String subjectCode = "";
+//        String subjectCode = "";
         for (Integer id : ids) {
         for (Integer id : ids) {
             ExamStudent student = studentService.findById(id);
             ExamStudent student = studentService.findById(id);
-            subjectCode = student.getSubjectCode();
+//            subjectCode = student.getSubjectCode();
             if (student != null && subjectCheck(student.getSubjectCode(), wu)) {
             if (student != null && subjectCheck(student.getSubjectCode(), wu)) {
                 try {
                 try {
                     if (lockService.trylock(LockType.STUDENT, student.getId()) && inspectedService.cancel(id)) {
                     if (lockService.trylock(LockType.STUDENT, student.getId()) && inspectedService.cancel(id)) {
@@ -508,7 +508,7 @@ public class InspectedController extends BaseExamController {
                 }
                 }
             }
             }
         }
         }
-        return "redirect:/admin/exam/inspected/list?subjectCode=" + subjectCode;
+        return "redirect:/admin/exam/inspected/list";
     }
     }
 
 
     @Logging(menu = "成绩复核进度查询", type = LogType.QUERY)
     @Logging(menu = "成绩复核进度查询", type = LogType.QUERY)