diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java index b5ab9e51d..bfe9e93fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java +++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java @@ -1,6 +1,8 @@ package com.iformall.service; +import cn.afterturn.easypoi.csv.CsvExportUtil; +import cn.afterturn.easypoi.csv.entity.CsvExportParams; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; @@ -36,19 +38,20 @@ public class ExcelService { defaultExport(list, pojoClass, fileName, response, exportParams, false); } - public void exportExcel(List list, String title, String sheetName, Class pojoClass, String fileName, HttpServletResponse response, boolean template) - { + public void exportExcel(List list, String title, String sheetName, Class pojoClass, String fileName, HttpServletResponse response, boolean template) { defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF), template); } - public void exportExcel(List> list, String fileName, HttpServletResponse response) - { + public void exportCsv(List list, String title, String sheetName, Class pojoClass, String fileName, HttpServletResponse response, boolean template) { + defaultExportCsv(list, pojoClass, fileName, response, new CsvExportParams(), template); + } + + public void exportExcel(List> list, String fileName, HttpServletResponse response) { defaultExport(list, fileName, response); } - private void defaultExport(List list, Class pojoClass, String fileName, HttpServletResponse response, ExportParams exportParams, boolean template) - { - Workbook workbook = ExcelExportUtil.exportExcel(exportParams,pojoClass,list); + private void defaultExport(List list, Class pojoClass, String fileName, HttpServletResponse response, ExportParams exportParams, boolean template) { + Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list); if (workbook != null) { if (template) { Sheet sheetAt = workbook.getSheetAt(0); @@ -65,24 +68,33 @@ public class ExcelService { downLoadExcel(fileName, response, workbook); } - private void defaultExport(List> list, String fileName, HttpServletResponse response) - { + private void defaultExportCsv(List list, Class pojoClass, String fileName, HttpServletResponse response, CsvExportParams exportParams, boolean template) { + try { + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", + "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8")); + CsvExportUtil.exportCsv(exportParams, pojoClass, list, response.getOutputStream()); + } catch (IOException e) { + throw new MallinkException(ErrorCode.EXCEL_EXPORT_ERROR.getCode(), e.getMessage()); + } + } + + private void defaultExport(List> list, String fileName, HttpServletResponse response) { Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF); - if (workbook != null); - downLoadExcel(fileName, response, workbook); + if (workbook != null) ; + downLoadExcel(fileName, response, workbook); } - private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) - { + private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) { try { response.setCharacterEncoding("UTF-8"); response.setHeader("content-Type", "application/vnd.ms-excel"); response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8")); - workbook.write(response.getOutputStream()); } - catch (IOException e) - { - throw new MallinkException(ErrorCode.EXCEL_EXPORT_ERROR.getCode(),e.getMessage()); + workbook.write(response.getOutputStream()); + } catch (IOException e) { + throw new MallinkException(ErrorCode.EXCEL_EXPORT_ERROR.getCode(), e.getMessage()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 8bb5d2897..993b9cefa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -314,7 +314,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } }); - excelService.exportExcel(list, null, filename, WxCouponOrderBVo.class, filename + ".xlsx", response, false); + excelService.exportCsv(list, null, filename, WxCouponOrderBVo.class, filename + ".xlsx", response, false); } @Override