fixbug

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

@@ -248,7 +248,7 @@ public class MarkQualityController extends BaseExamController {
         Marker marker = markerService.findById(markerId);
         List<Task> list = new ArrayList<>();
         MarkGroup group = groupService.findOne(marker.getExamId(), marker.getSubjectCode(), marker.getGroupNumber());
-        if (group != null && group.getStatus() == MarkStatus.FORMAL) {
+        if (group != null && group.getStatus() != MarkStatus.TRIAL) {
             // 正评查找已给分的评卷任务
             MarkLibrarySearchQuery query = new MarkLibrarySearchQuery();
             query.setExamId(marker.getExamId());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectClassController.java

@@ -62,7 +62,11 @@ public class ReportSubjectClassController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectCollegeController.java

@@ -61,7 +61,11 @@ public class ReportSubjectCollegeController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectController.java

@@ -58,7 +58,11 @@ public class ReportSubjectController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectGroupController.java

@@ -68,7 +68,11 @@ public class ReportSubjectGroupController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectQuestionController.java

@@ -65,7 +65,11 @@ public class ReportSubjectQuestionController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

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

@@ -59,7 +59,11 @@ public class ReportSubjectRangeController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectRangeQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherClassController.java

@@ -69,7 +69,11 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherController.java

@@ -61,7 +61,11 @@ public class ReportSubjectTeacherController extends BaseExamController {
     @RequestMapping("/export")
     public String export(ReportSubjectQuery query, HttpServletRequest request, HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
+        WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        if(webuser.isSubjectHeader()) {
+            query.setSubjectCode(webuser.getUser().getSubjectCode());
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);