fix bug

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkStudentServiceImpl.java

@@ -384,7 +384,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "总分");
                 mainNumberSet.add(question.getMainNumber());
             }
-            columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "-" + question.getSubNumber());
+            columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "-" + question.getSubNumber() + "得分");
             columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "-" + question.getSubNumber() + "满分");
         }
         String[] columnNames = columnNameList.toArray(new String[0]);
@@ -421,7 +421,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 valueList.add(item.getScore() == null ? CellValue.of("") : CellValue.of(item.getScore()));
                 valueList.add(item.getTotalScore() == null ? CellValue.of("") : CellValue.of(item.getTotalScore()));
             }
-            mainScoreMap = s.getScoreList(true, sQuestionList).stream().collect(Collectors.groupingBy(
+            mainScoreMap = s.getScoreList(false, sQuestionList).stream().collect(Collectors.groupingBy(
                     ScoreItem::getMainNumber, Collectors.summingDouble(ScoreItem::getScore)));
             for (ScoreItem item : s.getScoreList(false, sQuestionList)) {
                 if (!mainNumberSet.contains(item.getMainNumber())) {
@@ -1329,7 +1329,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "总分");
                 mainNumberSet.add(question.getMainNumber());
             }
-            columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "-" + question.getSubNumber());
+            columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "-" + question.getSubNumber() + "选项");
             columnNameList.add(question.getMainTitle() + " " + question.getMainNumber() + "-" + question.getSubNumber() + "满分");
         }
         String[] columnNames = columnNameList.toArray(new String[0]);
@@ -1384,7 +1384,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 valueList.add(item.getScore() == null ? CellValue.of("") : CellValue.of(item.getScore()));
                 valueList.add(item.getTotalScore() == null ? CellValue.of("") : CellValue.of(item.getTotalScore()));
             }
-            mainScoreMap = s.getScoreList(true, sQuestionList).stream().collect(Collectors.groupingBy(
+            mainScoreMap = s.getScoreList(false, sQuestionList).stream().collect(Collectors.groupingBy(
                     ScoreItem::getMainNumber, Collectors.summingDouble(ScoreItem::getScore)));
             for (ScoreItem item : s.getScoreList(false, sQuestionList)) {
                 if (!mainNumberSet.contains(item.getMainNumber())) {