From 81390cf53fed5d928c2f8b4fe4d4717a1d1db247 Mon Sep 17 00:00:00 2001
From: yechenhao <yechenhao>
Date: Fri, 22 May 2020 17:24:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kiisoo/ic/store/service/StorePromotionDataService.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
index 3084050..ed76f74 100644
--- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
+++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java
@@ -38,6 +38,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -655,10 +656,8 @@ public class StorePromotionDataService {
         });
 
         String[] headNames = new String[]{"零售公司编号", "零售公司","店铺名", "店铺编号", "客户名称", "客户id", "添加店铺总数"};
-        HSSFWorkbook ws = new HSSFWorkbook();
+        XSSFWorkbook ws = new XSSFWorkbook();
         Sheet hssfSheet = ws.createSheet("推广管理");
-        HSSFCellStyle cellStyle = ws.createCellStyle();
-        cellStyle.setWrapText(true);//设置自动换行
         int isAdd = 0;
         //设置列名
         if (null != headNames && headNames.length > 0) {
@@ -696,7 +695,7 @@ public class StorePromotionDataService {
             nameCell.setCellValue(customerDistinctDTO.getCount());
         }
         OutputStream output = response.getOutputStream();
-        response.setHeader("Content-disposition", "attachment; filename=store.xls");
+        response.setHeader("Content-disposition", "attachment; filename=store.xlsx");
         response.setContentType("application/vnd.ms-excel");
         ws.write(output);
         ws.close();