diff --git a/src/main/java/com/project/exam/domain/dto/ExportExamRecordDTO.java b/src/main/java/com/project/exam/domain/dto/ExportExamRecordDTO.java index c37e318..6b5e96d 100644 --- a/src/main/java/com/project/exam/domain/dto/ExportExamRecordDTO.java +++ b/src/main/java/com/project/exam/domain/dto/ExportExamRecordDTO.java @@ -8,8 +8,8 @@ public class ExportExamRecordDTO { @ExcelProperty("序号") private Integer serialNumber; - @ExcelProperty("关联子产品产品线") - private String subLineName; + @ExcelProperty("考试提交时间") + private String submitTime; @ExcelProperty("考试任务名称") private String taskName; diff --git a/src/main/java/com/project/exam/domain/service/impl/AdminExportExamRecordDomainServiceImpl.java b/src/main/java/com/project/exam/domain/service/impl/AdminExportExamRecordDomainServiceImpl.java index c6fae7c..fb2ade7 100644 --- a/src/main/java/com/project/exam/domain/service/impl/AdminExportExamRecordDomainServiceImpl.java +++ b/src/main/java/com/project/exam/domain/service/impl/AdminExportExamRecordDomainServiceImpl.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.List; import java.util.Objects; @@ -27,6 +28,9 @@ public class AdminExportExamRecordDomainServiceImpl implements AdminExportExamRe private final static Long MAX_EXPORT_NUM = 5000L; + private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + + @Override public void export(ExamRecordParam examRecordParam , HttpServletResponse response) throws Exception { long count = adminSearchExamRecordDomainService.count(examRecordParam); @@ -37,6 +41,9 @@ public class AdminExportExamRecordDomainServiceImpl implements AdminExportExamRe Result> pageResultResult = adminSearchExamRecordDomainService.adminSearch(examRecordParam); List dataList = pageResultResult.getData().getContent(); + + SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT); + List exportList = dataList.stream().map(dto -> { ExportExamRecordDTO exportDTO = new ExportExamRecordDTO(); BeanUtil.copyProperties(dto, exportDTO); @@ -45,6 +52,9 @@ public class AdminExportExamRecordDomainServiceImpl implements AdminExportExamRe } else { exportDTO.setScore(""); } + if (dto.getSubmitTime() != null) { + exportDTO.setSubmitTime(sdf.format(dto.getSubmitTime())); + } return exportDTO; }).toList(); EasyExcel.write(response.getOutputStream(), ExportExamRecordDTO.class)