Sfoglia il codice sorgente

3.4.4 update-20250511,bug修改

xiaofei 1 mese fa
parent
commit
944715baeb

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

@@ -8,6 +8,7 @@ import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.*;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -1516,7 +1517,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
             log.debug("导出Excel开始...");
             log.debug("导出Excel开始...");
             ExcelWriter writer = ExcelWriter.create(ExcelType.XLSX);
             ExcelWriter writer = ExcelWriter.create(ExcelType.XLSX);
             writer.writeDataArrays("成绩单", null, columnNames, columnValues.listIterator());
             writer.writeDataArrays("成绩单", null, columnNames, columnValues.listIterator());
-            FileOutputStream fileOut = new FileOutputStream(downloadFilePath + File.separator + basicCourse.getName() + "-成绩单" + SystemConstant.EXCEL_PREFIX);
+            FileOutputStream fileOut = new FileOutputStream(downloadFilePath + File.separator + new String((basicCourse.getName() + "-成绩单" + SystemConstant.EXCEL_PREFIX).getBytes(), StandardCharsets.UTF_8));
             writer.output(fileOut);
             writer.output(fileOut);
             fileOut.flush();
             fileOut.flush();
             fileOut.close();
             fileOut.close();
@@ -1528,7 +1529,7 @@ public class MarkStudentServiceImpl extends ServiceImpl<MarkStudentMapper, MarkS
                 for (Map.Entry<Object, List<CellValue[]>> entry : entrySet) {
                 for (Map.Entry<Object, List<CellValue[]>> entry : entrySet) {
                     writer = ExcelWriter.create(ExcelType.XLSX);
                     writer = ExcelWriter.create(ExcelType.XLSX);
                     writer.writeDataArrays("成绩单", null, columnNames, entry.getValue().listIterator());
                     writer.writeDataArrays("成绩单", null, columnNames, entry.getValue().listIterator());
-                    FileOutputStream classFileOut = new FileOutputStream(downloadFilePath + File.separator + basicCourse.getName() + "-" + entry.getKey() + "成绩单" + SystemConstant.EXCEL_PREFIX);
+                    FileOutputStream classFileOut = new FileOutputStream(downloadFilePath + File.separator + new String((basicCourse.getName() + "-" + entry.getKey() + "成绩单" + SystemConstant.EXCEL_PREFIX).getBytes(), StandardCharsets.UTF_8));
                     writer.output(classFileOut);
                     writer.output(classFileOut);
                     classFileOut.flush();
                     classFileOut.flush();
                     classFileOut.close();
                     classFileOut.close();

+ 1 - 0
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/MarkSubjectiveScoreServiceImpl.java

@@ -101,6 +101,7 @@ public class MarkSubjectiveScoreServiceImpl extends MppServiceImpl<MarkSubjectiv
                 questionVo.setFullScoreCount(Math.toIntExact(fullCount));
                 questionVo.setFullScoreCount(Math.toIntExact(fullCount));
                 questionVos.add(questionVo);
                 questionVos.add(questionVo);
             }
             }
+            questionVos.sort(Comparator.comparing(QuestionVo::getMainNumber).thenComparing(QuestionVo::getSubNumber));
             return questionVos;
             return questionVos;
 
 
         } else {
         } else {