From 9121dbf13cab719aa8683acef139cfed3c670415 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 3 Nov 2021 09:47:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2041536=20=E4=BF=AE=E6=94=B9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E5=AF=BC=E5=87=BAexcel=E5=90=8E?= =?UTF-8?q?=E7=BC=80=E4=B8=BAxlsx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysDepartController.java | 6 +++++- .../jero/modules/system/controller/SysDictController.java | 6 +++++- .../jero/modules/system/controller/SysUserController.java | 7 ++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index c6fb337f..fe22b6ee 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -40,6 +40,7 @@ import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -372,7 +373,10 @@ public class SysDepartController { mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表"); mv.addObject(NormalExcelConstants.CLASS, SysDepart.class); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("部门列表数据", "导出信息")); + ExportParams exportParams = new ExportParams("部门列表数据", "导出信息"); + // 导出xlsx + exportParams.setType(ExcelType.XSSF); + mv.addObject(NormalExcelConstants.PARAMS, exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index f36a0b4a..55558c3b 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -32,6 +32,7 @@ import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -463,7 +464,10 @@ public class SysDictController { mv.addObject(NormalExcelConstants.CLASS, SysDictPage.class); // 自定义表格参数 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("数据字典列表", "数据字典")); + ExportParams exportParams = new ExportParams("数据字典列表", "数据字典"); + // 导出xlsx + exportParams.setType(ExcelType.XSSF); + mv.addObject(NormalExcelConstants.PARAMS, exportParams); // 导出数据列表 mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index bf5af226..1f483c3d 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -39,6 +39,7 @@ import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; +import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -691,6 +692,8 @@ public class SysUserController { mv.addObject(NormalExcelConstants.CLASS, SysUser.class); ExportParams exportParams = new ExportParams("用户列表数据", "导出信息"); exportParams.setImageBasePath(upLoadPath); + // 导出xlsx + exportParams.setType(ExcelType.XSSF); mv.addObject(NormalExcelConstants.PARAMS, exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; @@ -708,7 +711,9 @@ public class SysUserController { //此处设置的filename无效 ,前端会重更新设置一下 mv.addObject(NormalExcelConstants.FILE_NAME, "用户导入模板文件"); mv.addObject(NormalExcelConstants.CLASS, SysUserTemplate.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户导入模板文件", "用户导入模板文件")); + ExportParams exportParams = new ExportParams("用户导入模板文件", "用户导入模板文件"); + exportParams.setType(ExcelType.XSSF); + mv.addObject(NormalExcelConstants.PARAMS, exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList()); return mv; }