|
|
@@ -356,6 +356,16 @@ public class BaseNewStudentController {
|
|
|
@PostMapping("/report-export-query")
|
|
|
@ApiOperation(value = "导出")
|
|
|
public ResponseEntity<byte[]> exportData(@Valid BaseNewStudentPageDto dto) {
|
|
|
+ if(dto.getBaseSemesterId() == null){
|
|
|
+ LambdaQueryWrapper<BaseSemester> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper
|
|
|
+ .orderByDesc(BaseSemester::getStartDate)
|
|
|
+ .select(BaseSemester.class,x -> VoToColumnUtil.fieldsToColumns(BaseSemester.class).contains(x.getProperty()));
|
|
|
+ List<BaseSemester> semesterList = semesterService.list(queryWrapper);
|
|
|
+ if(!semesterList.isEmpty()){
|
|
|
+ dto.setBaseSemesterId(semesterList.get(0).getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
List<BaseNewStudentPageVo> reportList = baseNewStudentService.getReportList(dto);
|
|
|
List<BaseNewStudentExportVo> exportVos = new ArrayList<>();
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
|