wangliang před 4 roky
rodič
revize
c6b871cf89

+ 8 - 0
themis-business/src/main/java/com/qmth/themis/business/dto/MarkResultStandardExportDto.java

@@ -83,6 +83,14 @@ public class MarkResultStandardExportDto implements Serializable{
     @ExcelNotExport
     private Long examId;
 
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
     public Map<Long, List<ExcelDto>> getAnswerExcetDto() {
         return answerExcetDto;
     }

+ 1 - 1
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultStandardExportTemplete.java

@@ -166,7 +166,7 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
                                         answer = AnswerTypeEnum.convertToTitle(s.getAnswer().replaceAll("\n", "").toUpperCase());
                                     }
                                     ExcelDto excelAnswerDto = new ExcelDto(title + "作答", answer);
-                                    ExcelDto excelScoreDto = new ExcelDto(title + "得分", String.valueOf(s.getScore()));
+                                    ExcelDto excelScoreDto = new ExcelDto(title + "得分", Objects.nonNull(s.getScore()) ? String.valueOf(s.getScore()) : null);
                                     List<ExcelDto> excelDtoList = null;
                                     if (!excelDtoMap.containsKey(m.getExamStudentId())) {
                                         excelDtoList = new ArrayList<>();