Merge remote-tracking branch 'origin/dev_xuwenjin' into dev0415_yinting

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

@@ -36,6 +36,7 @@ public class ReportSubjectController extends BaseExamController {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
 //        reportSubjectService.saveReportSubjectData(examId);
+        query.setExamId(examId);
         query = reportSubjectService.findByQuery(query);
         if (query.getCurrentCount() > 0) {
             model.addAttribute("list", query.getResult());

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

@@ -36,7 +36,7 @@ public class ReportSubjectGroupController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
-        reportSubjectGroupService.saveReportSubjectGroupData(1, "1118802");
+//        reportSubjectGroupService.saveReportSubjectGroupData(1, "1118802");
         query.setExamId(examId);
         if (StringUtils.isNotBlank(query.getSubjectCode())) {
             List<ReportSubjectGroup> groups = reportSubjectGroupService.findByQuery(query);

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

@@ -38,6 +38,7 @@ public class ReportSubjectRangeController extends BaseExamController {
         int examId = getSessionExamId(request);
 //        reportSubjectRangeService.saveReportRangeSubjectData(1);
         User user = RequestUtils.getWebUser(request).getUser();
+        query.setExamId(examId);
         query = reportSubjectRangeService.findByQuery(query);
         if (query.getCurrentCount() > 0) {
             model.addAttribute("list", query.getResult());