|
@@ -62,6 +62,7 @@ import javax.validation.Valid;
|
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.ByteArrayOutputStream;
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.LinkedHashMap;
|
|
import java.util.LinkedHashMap;
|
|
@@ -357,7 +358,7 @@ public class BaseNewStudentController {
|
|
|
public ResponseEntity<byte[]> exportData(@Valid BaseNewStudentPageDto dto) {
|
|
public ResponseEntity<byte[]> exportData(@Valid BaseNewStudentPageDto dto) {
|
|
|
List<BaseNewStudentPageVo> reportList = baseNewStudentService.getReportList(dto);
|
|
List<BaseNewStudentPageVo> reportList = baseNewStudentService.getReportList(dto);
|
|
|
List<BaseNewStudentExportVo> exportVos = new ArrayList<>();
|
|
List<BaseNewStudentExportVo> exportVos = new ArrayList<>();
|
|
|
-
|
|
|
|
|
|
|
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
for (BaseNewStudentPageVo el : reportList) {
|
|
for (BaseNewStudentPageVo el : reportList) {
|
|
|
BaseNewStudentExportVo vo = BeanUtil.toBean(el, BaseNewStudentExportVo.class);
|
|
BaseNewStudentExportVo vo = BeanUtil.toBean(el, BaseNewStudentExportVo.class);
|
|
|
if(el.getIsAdjust() == 1){
|
|
if(el.getIsAdjust() == 1){
|
|
@@ -365,6 +366,7 @@ public class BaseNewStudentController {
|
|
|
}else if(el.getIsAdjust() == 0){
|
|
}else if(el.getIsAdjust() == 0){
|
|
|
vo.setReportStatus("否");
|
|
vo.setReportStatus("否");
|
|
|
}
|
|
}
|
|
|
|
|
+ vo.setReportTime(el.getReportTime().format(formatter));
|
|
|
exportVos.add(vo);
|
|
exportVos.add(vo);
|
|
|
}
|
|
}
|
|
|
ByteArrayOutputStream bot = new ByteArrayOutputStream();
|
|
ByteArrayOutputStream bot = new ByteArrayOutputStream();
|