From 74be20dfb5b244bbae3387db7a1aecb9fc1a21bd Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期三, 16 六月 2021 18:22:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/AssetExportSMOImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/AssetExportSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/AssetExportSMOImpl.java
old mode 100644
new mode 100755
index 2fbf9d1..e31fe09
--- a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/AssetExportSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/AssetExportSMOImpl.java
@@ -14,6 +14,7 @@
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +53,7 @@
Workbook workbook = null; //宸ヤ綔绨�
//宸ヤ綔琛�
- workbook = new HSSFWorkbook();
+ workbook = new XSSFWorkbook();
//鑾峰彇妤间俊鎭�
getFloors(pd, result, workbook);
//鑾峰彇涓氫富淇℃伅
@@ -65,7 +66,7 @@
ByteArrayOutputStream os = new ByteArrayOutputStream();
MultiValueMap headers = new HttpHeaders();
headers.add("content-type", "application/octet-stream;charset=UTF-8");
- headers.add("Content-Disposition", "attachment;filename=" + DateUtil.getyyyyMMddhhmmssDateString() + ".xls");
+ headers.add("Content-Disposition", "attachment;filename=" + DateUtil.getyyyyMMddhhmmssDateString() + ".xlsx");
headers.add("Pargam", "no-cache");
headers.add("Cache-Control", "no-cache");
//headers.add("Content-Disposition", "attachment; filename=" + outParam.getString("fileName"));
--
Gitblit v1.8.0