lighter 4 лет назад
Родитель
Сommit
525772ad26

+ 1 - 1
src/main/java/thyyxxk/webserver/service/wxapi/WxApiService.java

@@ -185,7 +185,7 @@ public class WxApiService {
             content[i][13] = order.getRefundOpName();
             content[i][14] = DateUtil.formatDatetime(order.getRefundOpDatetime());
         }
-        ExcelUtil.exportExcel(response, sheetName, title, content);
+        ExcelUtil.exportExcel(response, title, content);
     }
 
     private IPage<WxPayOrder> getWxPayOrderIPage(QueryWxOrderParam param) {

+ 5 - 7
src/main/java/thyyxxk/webserver/utils/ExcelUtil.java

@@ -10,14 +10,12 @@ public class ExcelUtil {
     /*
      * 导出Excel
      */
-    private static HSSFWorkbook getHSSFWorkbook(String sheetName, String[] title, String[][] values, HSSFWorkbook wb) {
+    private static HSSFWorkbook getHSSFWorkbook(String[] title, String[][] values) {
         // 第一步,创建一个HSSFWorkbook,对应一个Excel文件
-        if (wb == null) {
-            wb = new HSSFWorkbook();
-        }
+        HSSFWorkbook wb = new HSSFWorkbook();
 
         // 第二步,在workbook中添加一个sheet,对应Excel文件中的sheet
-        HSSFSheet sheet = wb.createSheet(sheetName);
+        HSSFSheet sheet = wb.createSheet("sheet1");
 
         // 第三步,在sheet中添加表头第0行,注意老版本poi对Excel行数列数有限制
         HSSFRow row = sheet.createRow(0);
@@ -47,9 +45,9 @@ public class ExcelUtil {
         return wb;
     }
 
-    public static void exportExcel(HttpServletResponse response,String sheetName,
+    public static void exportExcel(HttpServletResponse response,
                                    String[] title, String[][] values) {
-        HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(sheetName, title, values, null);
+        HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook(title, values);
         response.setContentType("application/octet-stream;charset=ISO8859-1");
         response.setHeader("Cache-Control", "no-cache");
         OutputStream out = null;