From 65b0fab80d5575012ff8d5c4a5584d57da28d572 Mon Sep 17 00:00:00 2001 From: kezhijie Date: Tue, 5 Dec 2023 10:09:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/JeecgController.java | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java index b2a58446..5a07bde2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java @@ -37,9 +37,7 @@ import java.util.*; */ @Slf4j public class JeecgController> { - /** - * issues/2933 JeecgController注入service时改用protected修饰，能避免重复引用service - */ + /**issues/2933 JeecgController注入service时改用protected修饰，能避免重复引用service*/ @Autowired protected S service; @Resource @@ -59,7 +57,7 @@ public class JeecgController> { String selections = request.getParameter("selections"); if (oConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); - queryWrapper.in("id", selectionList); + queryWrapper.in("id",selectionList); } // Step.2 获取导出数据 List exportList = service.list(queryWrapper); @@ -70,54 +68,53 @@ public class JeecgController> { mv.addObject(NormalExcelConstants.FILE_NAME, title); mv.addObject(NormalExcelConstants.CLASS, clazz); //update-begin--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置-------------------- - ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); exportParams.setImageBasePath(jeecgBaseConfig.getPath().getUpload()); //update-end--Author:liusq Date:20210126 for：图片导出报错，ImageBasePath未设置---------------------- - mv.addObject(NormalExcelConstants.PARAMS, exportParams); + mv.addObject(NormalExcelConstants.PARAMS,exportParams); mv.addObject(NormalExcelConstants.DATA_LIST, exportList); return mv; } - /** * 根据每页sheet数量导出多sheet * * @param request - * @param object 实体类 - * @param clazz 实体类class - * @param title 标题 + * @param object 实体类 + * @param clazz 实体类class + * @param title 标题 * @param exportFields 导出字段自定义 - * @param pageNum 每个sheet的数据条数 + * @param pageNum 每个sheet的数据条数 * @param request */ - protected ModelAndView exportXlsSheet(HttpServletRequest request, T object, Class clazz, String title, String exportFields, Integer pageNum) { + protected ModelAndView exportXlsSheet(HttpServletRequest request, T object, Class clazz, String title,String exportFields,Integer pageNum) { // Step.1 组装查询条件 QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap()); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // Step.2 计算分页sheet数据 double total = service.count(); - int count = (int) Math.ceil(total / pageNum); + int count = (int)Math.ceil(total/pageNum); //update-begin-author:liusq---date:20220629--for: 多sheet导出根据选择导出写法调整 --- // Step.3 过滤选中数据 String selections = request.getParameter("selections"); if (oConvertUtils.isNotEmpty(selections)) { List selectionList = Arrays.asList(selections.split(",")); - queryWrapper.in("id", selectionList); + queryWrapper.in("id",selectionList); } //update-end-author:liusq---date:20220629--for: 多sheet导出根据选择导出写法调整 --- // Step.4 多sheet处理 List> listMap = new ArrayList>(); - for (int i = 1; i <= count; i++) { + for (int i = 1; i <=count ; i++) { Page page = new Page(i, pageNum); IPage pageList = service.page(page, queryWrapper); List exportList = pageList.getRecords(); Map map = new HashMap<>(5); - ExportParams exportParams = new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title + i, jeecgBaseConfig.getPath().getUpload()); + ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title+i,jeecgBaseConfig.getPath().getUpload()); exportParams.setType(ExcelType.XSSF); //map.put("title",exportParams); //表格Title - map.put(NormalExcelConstants.PARAMS, exportParams); + map.put(NormalExcelConstants.PARAMS,exportParams); //表格对应实体 - map.put(NormalExcelConstants.CLASS, clazz); + map.put(NormalExcelConstants.CLASS,clazz); //数据集合 map.put(NormalExcelConstants.DATA_LIST, exportList); listMap.add(map); @@ -136,9 +133,9 @@ public class JeecgController> { * * @param request */ - protected ModelAndView exportXls(HttpServletRequest request, T object, Class clazz, String title, String exportFields) { - ModelAndView mv = this.exportXls(request, object, clazz, title); - mv.addObject(NormalExcelConstants.EXPORT_FIELDS, exportFields); + protected ModelAndView exportXls(HttpServletRequest request, T object, Class clazz, String title,String exportFields) { + ModelAndView mv = this.exportXls(request,object,clazz,title); + mv.addObject(NormalExcelConstants.EXPORT_FIELDS,exportFields); return mv; } @@ -187,9 +184,9 @@ public class JeecgController> { //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示 String msg = e.getMessage(); log.error(msg, e); - if (msg != null && msg.indexOf("Duplicate entry") >= 0) { + if(msg!=null && msg.indexOf("Duplicate entry")>=0){ return Result.error("文件导入失败:有重复数据！"); - } else { + }else{ return Result.error("文件导入失败:" + e.getMessage()); } //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示