导出成绩加入examRecordId

themis-business/src/main/java/com/qmth/themis/business/dto/MarkResultSimpleExportDto.java

@@ -1,7 +1,5 @@
 package com.qmth.themis.business.dto;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.themis.business.annotation.ExcelNotExport;
 import com.qmth.themis.business.annotation.ExcelNote;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +21,9 @@ public class MarkResultSimpleExportDto implements Serializable {
     @ExcelNote(value = "姓名")
     private String name;
 
+    @ExcelNote(value = "考试记录ID")
+    private String recordId;
+
     @ExcelNote(value = "证件号")
     private String identity;
 
@@ -62,10 +63,6 @@ public class MarkResultSimpleExportDto implements Serializable {
     @ExcelNote(value = "总分")
     private String sumScore;
 
-    @ApiModelProperty(value = "考试记录ID")
-    @ExcelNotExport
-    private Long recordId;
-
     @ApiModelProperty(value = "试卷ID")
     @ExcelNotExport
     private Long paperId;
@@ -114,11 +111,11 @@ public class MarkResultSimpleExportDto implements Serializable {
         this.paperId = paperId;
     }
 
-    public Long getRecordId() {
+    public String getRecordId() {
         return recordId;
     }
 
-    public void setRecordId(Long recordId) {
+    public void setRecordId(String recordId) {
         this.recordId = recordId;
     }
 

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

@@ -24,6 +24,9 @@ public class MarkResultStandardExportDto implements Serializable {
     @ExcelNote(value = "姓名")
     private String name;
 
+    @ExcelNote(value = "考试记录ID")
+    private String recordId;
+
     @ExcelNote(value = "证件号")
     private String identity;
 
@@ -67,10 +70,6 @@ public class MarkResultStandardExportDto implements Serializable {
     @ExcelDynamicExport
     private Map<Long, List<ExcelDto>> answerExcetDto;
 
-    @ApiModelProperty(value = "考试记录ID")
-    @ExcelNotExport
-    private Long recordId;
-
     @ApiModelProperty(value = "试卷ID")
     @ExcelNotExport
     private Long paperId;
@@ -127,11 +126,11 @@ public class MarkResultStandardExportDto implements Serializable {
         this.paperId = paperId;
     }
 
-    public Long getRecordId() {
+    public String getRecordId() {
         return recordId;
     }
 
-    public void setRecordId(Long recordId) {
+    public void setRecordId(String recordId) {
         this.recordId = recordId;
     }
 

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultSimpleExportTemplete.java

@@ -115,21 +115,21 @@ public class TaskMarkResultSimpleExportTemplete implements TaskExportTemplete {
                         if (Objects.nonNull(tOeExamRecord)) {
                             examRecordIdsSet.add(String.valueOf(tOeExamRecord.getId()));
                             markResultSimpleExportDto.setObjectiveScore(Objects.isNull(tOeExamRecord.getObjectiveScore()) ? "0" : String.valueOf(tOeExamRecord.getObjectiveScore()));
-                            markResultSimpleExportDto.setRecordId(tOeExamRecord.getId());
+                            markResultSimpleExportDto.setRecordId(String.valueOf(tOeExamRecord.getId()));
                             markResultSimpleExportDto.setPaperId(tOeExamRecord.getPaperId());
                             markResultSimpleExportDto.setSubjectiveScore(Objects.isNull(markResultSimpleExportDto.getSubjectiveScore()) ? "0" : String.valueOf(markResultSimpleExportDto.getSubjectiveScore()));
                             markResultSimpleExportDto.setSumScore(String.valueOf(Double.parseDouble(markResultSimpleExportDto.getObjectiveScore()) + Double.parseDouble(markResultSimpleExportDto.getSubjectiveScore())));
                         }
                     }
                 }
-                Map<Long, MarkResultSimpleExportDto> markResultSimpleExportDtoMap = markResultSimpleExportDtoList.stream().collect(
+                Map<String, MarkResultSimpleExportDto> markResultSimpleExportDtoMap = markResultSimpleExportDtoList.stream().collect(
                         Collectors.toMap(MarkResultSimpleExportDto::getRecordId, Function.identity(), (dto1, dto2) -> dto1));
 
                 //获取云阅卷同步成绩
                 List<TSyncExamStudentScore> tSyncExamStudentScoreList = tSyncExamStudentScoreService.findByExamRecordIds(examRecordIdsSet);
                 if (!CollectionUtils.isEmpty(tSyncExamStudentScoreList)) {
                     for (TSyncExamStudentScore t : tSyncExamStudentScoreList) {
-                        MarkResultSimpleExportDto markResultSimpleExportDto = markResultSimpleExportDtoMap.get(Long.parseLong(t.getExamNumber()));
+                        MarkResultSimpleExportDto markResultSimpleExportDto = markResultSimpleExportDtoMap.get(t.getExamNumber());
                         if (Objects.nonNull(markResultSimpleExportDto)) {
                             markResultSimpleExportDto.setSubjectiveScore(Objects.isNull(t.getSubjectiveScore()) ? "0" : String.valueOf(t.getSubjectiveScore()));
                             markResultSimpleExportDto.setSumScore(String.valueOf(Double.parseDouble(markResultSimpleExportDto.getObjectiveScore()) + Double.parseDouble(markResultSimpleExportDto.getSubjectiveScore())));

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

@@ -132,7 +132,7 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
                             ExamPaperCacheBean examPaperCacheBean = teExamPaperService.getExamPaperCacheBean(tOeExamRecord.getPaperId());
                             examRecordIdsSet.add(String.valueOf(tOeExamRecord.getId()));
                             markResultSimpleExportDto.setObjectiveScore(Objects.isNull(tOeExamRecord.getObjectiveScore()) ? "0" : String.valueOf(tOeExamRecord.getObjectiveScore()));
-                            markResultSimpleExportDto.setRecordId(tOeExamRecord.getId());
+                            markResultSimpleExportDto.setRecordId(String.valueOf(tOeExamRecord.getId()));
                             markResultSimpleExportDto.setPaperId(tOeExamRecord.getPaperId());
                             if (Objects.nonNull(examPaperCacheBean)) {
                                 markResultSimpleExportDto.setPaperName(examPaperCacheBean.getName());
@@ -142,14 +142,14 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
                         }
                     }
                 }
-                Map<Long, MarkResultSimpleExportDto> markResultSimpleExportDtoMap = markResultSimpleExportDtoList.stream().collect(
+                Map<String, MarkResultSimpleExportDto> markResultSimpleExportDtoMap = markResultSimpleExportDtoList.stream().collect(
                         Collectors.toMap(MarkResultSimpleExportDto::getRecordId, Function.identity(), (dto1, dto2) -> dto1));
 
                 //获取云阅卷同步成绩
                 List<TSyncExamStudentScore> tSyncExamStudentScoreList = tSyncExamStudentScoreService.findByExamRecordIds(examRecordIdsSet);
                 if (!CollectionUtils.isEmpty(tSyncExamStudentScoreList)) {
                     for (TSyncExamStudentScore t : tSyncExamStudentScoreList) {
-                        MarkResultSimpleExportDto markResultSimpleExportDto = markResultSimpleExportDtoMap.get(Long.parseLong(t.getExamNumber()));
+                        MarkResultSimpleExportDto markResultSimpleExportDto = markResultSimpleExportDtoMap.get(t.getExamNumber());
                         if (Objects.nonNull(markResultSimpleExportDto)) {
                             markResultSimpleExportDto.setSubjectiveScore(Objects.isNull(t.getSubjectiveScore()) ? "0" : String.valueOf(t.getSubjectiveScore()));
                             markResultSimpleExportDto.setSumScore(String.valueOf(Double.parseDouble(markResultSimpleExportDto.getObjectiveScore()) + Double.parseDouble(markResultSimpleExportDto.getSubjectiveScore())));
@@ -194,7 +194,7 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
                     }
                     if (Objects.nonNull(m.getRecordId())) {//处理考生答案
                         QueryWrapper<TOeExamAnswer> tOeExamAnswerQueryWrapper = new QueryWrapper<>();
-                        tOeExamAnswerQueryWrapper.lambda().eq(TOeExamAnswer::getExamRecordId, m.getRecordId());
+                        tOeExamAnswerQueryWrapper.lambda().eq(TOeExamAnswer::getExamRecordId, Long.parseLong(m.getRecordId()));
                         List<TOeExamAnswer> tOeExamAnswerList = tOeExamAnswerService.list(tOeExamAnswerQueryWrapper);
                         for (TOeExamAnswer s : tOeExamAnswerList) {
                             String questionsTitle = String.valueOf(s.getMainNumber());