|
@@ -349,8 +349,8 @@ public class ExcelUtil<T>
|
|
|
// Workbook workbook = null;
|
|
// Workbook workbook = null;
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- Workbook workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF);
|
|
|
|
|
- String filename = encodingFilename(sheetName);
|
|
|
|
|
|
|
+ Workbook workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.HSSF);
|
|
|
|
|
+ String filename = encodingXLSFilename(sheetName);
|
|
|
out = new FileOutputStream(getAbsoluteFile(filename));
|
|
out = new FileOutputStream(getAbsoluteFile(filename));
|
|
|
workbook.write(out);
|
|
workbook.write(out);
|
|
|
return AjaxResult.success(filename);
|
|
return AjaxResult.success(filename);
|
|
@@ -930,6 +930,12 @@ public class ExcelUtil<T>
|
|
|
/**
|
|
/**
|
|
|
* 编码文件名
|
|
* 编码文件名
|
|
|
*/
|
|
*/
|
|
|
|
|
+ public String encodingXLSFilename(String filename)
|
|
|
|
|
+ {
|
|
|
|
|
+ filename = UUID.randomUUID().toString() + "_" + filename + ".xls";
|
|
|
|
|
+ return filename;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
public String encodingFilename(String filename)
|
|
public String encodingFilename(String filename)
|
|
|
{
|
|
{
|
|
|
filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
|
|
filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
|