|
@@ -101,13 +101,11 @@ public class TeacherAwardController {
|
|
return RT.ok(pageOutput);
|
|
return RT.ok(pageOutput);
|
|
}
|
|
}
|
|
|
|
|
|
- @PostMapping(value = "/export-query")
|
|
|
|
|
|
+ @GetMapping(value = "/export-query")
|
|
@ApiOperation(value="导出")
|
|
@ApiOperation(value="导出")
|
|
@SaCheckPermission("teacheraward:detail")
|
|
@SaCheckPermission("teacheraward:detail")
|
|
- public ResponseEntity<byte[]> exportQuery(@Valid @RequestBody TeacherAwardStatisticsPageDto dto){
|
|
|
|
|
|
+ public ResponseEntity<byte[]> exportQuery(TeacherAwardStatisticsPageDto dto){
|
|
List<TeacherAwardStatisticsPageVo> list = teacherAwardItemService.getStatisticsList(dto);
|
|
List<TeacherAwardStatisticsPageVo> list = teacherAwardItemService.getStatisticsList(dto);
|
|
- Map<Long, String> userMap = list.stream().collect(Collectors.toMap(TeacherAwardStatisticsPageVo::getId, TeacherAwardStatisticsPageVo::getName));
|
|
|
|
-
|
|
|
|
|
|
|
|
List<Long> userIds = list.stream().map(TeacherAwardStatisticsPageVo::getId).collect(Collectors.toList());
|
|
List<Long> userIds = list.stream().map(TeacherAwardStatisticsPageVo::getId).collect(Collectors.toList());
|
|
TeacherAwardFileListDto listDto = new TeacherAwardFileListDto();
|
|
TeacherAwardFileListDto listDto = new TeacherAwardFileListDto();
|
|
@@ -120,7 +118,9 @@ public class TeacherAwardController {
|
|
|
|
|
|
for (TeacherAwardStatisticsPageVo el : list) {
|
|
for (TeacherAwardStatisticsPageVo el : list) {
|
|
List<TeacherAwardFileListVo> fileList = filesMap.get(el.getId());
|
|
List<TeacherAwardFileListVo> fileList = filesMap.get(el.getId());
|
|
-
|
|
|
|
|
|
+ if(fileList == null){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
for (int i = 0; i < fileList.size(); i++) {
|
|
for (int i = 0; i < fileList.size(); i++) {
|
|
try {
|
|
try {
|
|
URL url = new URL(fileList.get(i).getFileUrl());
|
|
URL url = new URL(fileList.get(i).getFileUrl());
|