diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java index 1ea9071d..d9f1a4a9 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java @@ -36,6 +36,11 @@ import java.util.stream.Collectors; */ @Slf4j public class JeroController> { + + private static final String CLASS = "entity"; + private static final String PARAMS = "params"; + private static final String FILE_NAME = "fileName"; + @Autowired S service; @@ -66,13 +71,13 @@ public class JeroController> { // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, clazz); + mv.addObject(FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(CLASS, clazz); //update-begin--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置-------------------- ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); exportParams.setImageBasePath(upLoadPath); //update-end--Author:liusq Date:20210126 for:图片导出报错,ImageBasePath未设置---------------------- - mv.addObject(NormalExcelConstants.PARAMS,exportParams); + mv.addObject(PARAMS,exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, exportList); return mv; } @@ -96,9 +101,9 @@ public class JeroController> { double total = service.count(); int count = (int)Math.ceil(total/pageNum); // Step.3 多sheet处理 - List> listMap = new ArrayList>(); + List> listMap = new ArrayList<>(); for (int i = 1; i <=count ; i++) { - Page page = new Page(i, pageNum); + Page page = new Page<>(i, pageNum); IPage pageList = service.page(page, queryWrapper); List records = pageList.getRecords(); List exportList = null; @@ -110,18 +115,18 @@ public class JeroController> { } else { exportList = records; } - Map map = new HashMap(); + Map map = new HashMap<>(); ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title+i,upLoadPath); exportParams.setType(ExcelType.XSSF); //map.put("title",exportParams);//表格Title - map.put(NormalExcelConstants.PARAMS,exportParams);//表格Title - map.put(NormalExcelConstants.CLASS,clazz);//表格对应实体 + map.put(PARAMS,exportParams);//表格Title + map.put(CLASS,clazz);//表格对应实体 map.put(NormalExcelConstants.DATA_LIST, exportList);//数据集合 listMap.add(map); } // Step.4 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.MAP_LIST, listMap); return mv; }