fix bugs

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkGroupController.java

@@ -155,7 +155,7 @@ public class MarkGroupController extends BaseExamController {
 
     @Logging(menu = "大题数量校对", type = LogType.UPDATE)
     @RequestMapping("/check-count")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String ckeckCount(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode) {
         int examId = getSessionExamId(request);
@@ -171,7 +171,7 @@ public class MarkGroupController extends BaseExamController {
 
     @Logging(menu = "大题任务回收", type = LogType.UPDATE)
     @RequestMapping("/release")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String release(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number) {
         int examId = getSessionExamId(request);
@@ -191,7 +191,7 @@ public class MarkGroupController extends BaseExamController {
 
     @Logging(menu = "大题重置", type = LogType.UPDATE)
     @RequestMapping("/reset")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String reset(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number) {
         int examId = getSessionExamId(request);
@@ -217,7 +217,7 @@ public class MarkGroupController extends BaseExamController {
 
     @Logging(menu = "大题状态修改", type = LogType.QUERY)
     @RequestMapping("/changeStatus")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String changeStatus(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number, @RequestParam MarkStatus status) {
         int examId = getSessionExamId(request);
@@ -255,7 +255,7 @@ public class MarkGroupController extends BaseExamController {
     }
 
     @RequestMapping("/add")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String add(HttpServletRequest request, Model model, @RequestParam String subjectCode) {
         int examId = getSessionExamId(request);
         ExamSubject subject = subjectService.find(examId, subjectCode);
@@ -277,7 +277,7 @@ public class MarkGroupController extends BaseExamController {
     }
 
     @RequestMapping("/edit-simple")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String editSimple(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number) {
         int examId = getSessionExamId(request);
@@ -305,7 +305,7 @@ public class MarkGroupController extends BaseExamController {
     }
 
     @RequestMapping("/edit-full")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String editFull(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number) {
         int examId = getSessionExamId(request);
@@ -330,7 +330,7 @@ public class MarkGroupController extends BaseExamController {
 
     @Logging(menu = "删除大题", type = LogType.DELETE)
     @RequestMapping("/delete")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String delete(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number) {
         int examId = getSessionExamId(request);
@@ -370,7 +370,7 @@ public class MarkGroupController extends BaseExamController {
     @Logging(menu = "修改大题", type = LogType.UPDATE)
     @SuppressWarnings("unchecked")
     @RequestMapping("/update")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     @Transactional
     public String update(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number, @RequestParam Boolean reset,
@@ -467,7 +467,7 @@ public class MarkGroupController extends BaseExamController {
     @Logging(menu = "新增大题", type = LogType.ADD)
     @SuppressWarnings("unchecked")
     @RequestMapping("/insert")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     @Transactional
     public String insert(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number, @RequestParam Integer[] questionIds,
@@ -530,7 +530,6 @@ public class MarkGroupController extends BaseExamController {
     }
 
     @RequestMapping("/getPictureConfig")
-    @RoleRequire(Role.SCHOOL_ADMIN)
     public String get(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer number) {
         int examId = getSessionExamId(request);
@@ -595,7 +594,7 @@ public class MarkGroupController extends BaseExamController {
 
     @Logging(menu = "大题关闭", type = LogType.QUERY)
     @RequestMapping("/finish")
-    @RoleRequire(Role.SCHOOL_ADMIN)
+    @RoleRequire({ Role.SCHOOL_ADMIN, Role.SUBJECT_HEADER })
     public String finish(HttpServletRequest request, Model model, RedirectAttributes redirectAttributes,
             @RequestParam String subjectCode, @RequestParam Integer[] groupNumbers) {
         int examId = getSessionExamId(request);

stmms-web/src/main/java/cn/com/qmth/stmms/mark/MarkController.java

@@ -273,7 +273,7 @@ public class MarkController extends BaseController {
         setting.accumulate("startTime", exam.getStartTime() == null ? 0 : exam.getStartTime().getTime());
         setting.accumulate("endTime", exam.getEndTime() == null ? 0 : exam.getEndTime().getTime());
         setting.accumulate("topCount", marker.getTopCount() != null ? marker.getTopCount() : 0);
-        setting.accumulate("sheetView", group.isSheetView());
+        setting.accumulate("sheetView", group.isSheetView() && exam.isSheetView());
         setting.accumulate("enableAllZero", group.isEnableAllZero());
         setting.accumulate("statusValue", group.getStatus());
         setting.accumulate("groupNumber", group.getNumber());