修复报告没有主观题

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

@@ -152,7 +152,7 @@ public class ReportController {
             List<ReportSubjectGroup> objectiveGroup = groupService.findByExamIdAndSubjectCodeAndObjectiveAndPaperType(
                     examId, subjectCode, true, paperType);
             List<ReportSubjectGroup> subjectiveGroup = groupService.findByExamIdAndSubjectCodeAndObjectiveAndPaperType(
-                    examId, subjectCode, false, null);
+                    examId, subjectCode, false, NULL_PAPER_TYPE_PLACEHOLDER);
             subjectGroups.addAll(objectiveGroup);
             subjectGroups.addAll(subjectiveGroup);
             result.accumulate("basic_paper", getPaperJson(reportSubject));
@@ -440,8 +440,8 @@ public class ReportController {
                     .findByExamIdAndSubjectCodeAndObjectiveAndPaperType(examId, subjectCode, true, paperType,
                             reportSubjectClass.getClassName());
             List<ReportSubjectClassGroup> classGroupsListS = classGroupService
-                    .findByExamIdAndSubjectCodeAndObjectiveAndPaperType(examId, subjectCode, false, null,
-                            reportSubjectClass.getClassName());
+                    .findByExamIdAndSubjectCodeAndObjectiveAndPaperType(examId, subjectCode, false,
+                            NULL_PAPER_TYPE_PLACEHOLDER, reportSubjectClass.getClassName());
             classGroupsList.addAll(classGroupsListO);
             classGroupsList.addAll(classGroupsListS);
             for (ReportSubjectClassGroup r : classGroupsList) {
@@ -514,8 +514,8 @@ public class ReportController {
                     .findByExamIdAndSubjectCodeAndObjectiveAndPaperType(examId, subjectCode, true, paperType,
                             reportSubjectClass.getClassName());
             List<ReportSubjectClassGroup> classGroupsListS = classGroupService
-                    .findByExamIdAndSubjectCodeAndObjectiveAndPaperType(examId, subjectCode, false, null,
-                            reportSubjectClass.getClassName());
+                    .findByExamIdAndSubjectCodeAndObjectiveAndPaperType(examId, subjectCode, false,
+                            NULL_PAPER_TYPE_PLACEHOLDER, reportSubjectClass.getClassName());
             classGroupsList.addAll(classGroupsListO);
             classGroupsList.addAll(classGroupsListS);
             for (ReportSubjectClassGroup r : classGroupsList) {