修复一个分组下多个大题排序问题

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamQuestionDao.java

@@ -13,7 +13,7 @@ import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
 public interface ExamQuestionDao extends JpaRepository<ExamQuestion, Integer>, JpaSpecificationExecutor<ExamQuestion> {
 
     @Query("select q from ExamQuestion q where q.examId=?1 and  q.subjectCode=?2 and q.objective=?3 "
-            + "order by q.paperType, q.mainNumber, q.subNumber")
+            + "order by q.paperType, q.groupNumber, q.mainNumber, q.subNumber")
     public List<ExamQuestion> findByExamIdAndSubjectCodeAndObjective(Integer examId, String subjectCode,
             boolean objective);
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/QuestionGroup.java

@@ -4,7 +4,7 @@ public class QuestionGroup {
 
     private boolean objective;
 
-    private int number;
+    private int mainNumber;
 
     private double totalScore;
 
@@ -12,9 +12,9 @@ public class QuestionGroup {
     
     private String paperType;
 
-    public QuestionGroup(boolean objective, int number,String paperType) {
+    public QuestionGroup(boolean objective, int mainNumber,String paperType) {
         this.objective = objective;
-        this.number = number;
+        this.mainNumber = mainNumber;
         this.paperType = paperType;
     }
 
@@ -26,8 +26,8 @@ public class QuestionGroup {
         fullScore += score;
     }
 
-    public int getNumber() {
-        return number;
+    public int getMainNumber() {
+        return mainNumber;
     }
 
     public double getTotalScore() {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectClassGroupModule.java

@@ -20,7 +20,7 @@ public class SubjectClassGroupModule extends SubjectGroupModule implements Modul
 
     public String getKey(ExamStudent student, QuestionGroup group) {
         return student.getSubjectCode() + "\t" + student.getClassName() + "\t" + group.isObjective() + "\t"
-                + StringUtils.trimToEmpty(group.getPaperType()) + "\t" + +group.getNumber();
+                + StringUtils.trimToEmpty(group.getPaperType()) + "\t" + +group.getMainNumber();
     }
 
     public void save() {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectGroupModule.java

@@ -73,7 +73,7 @@ public class SubjectGroupModule implements Module {
 
     public String getKey(ExamStudent student, QuestionGroup group) {
         return student.getSubjectCode() + "\t" + group.isObjective() + "\t"
-                + StringUtils.trimToEmpty(group.getPaperType()) + "\t" + group.getNumber();
+                + StringUtils.trimToEmpty(group.getPaperType()) + "\t" + group.getMainNumber();
     }
 
     public void save() {