From 7a35f390e7da0410283877ec23e1d9603e2a48a2 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 14 May 2019 15:36:03 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AF=BC=E5=87=BAexcel][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel=E6=A0=BC=E5=BC=8F=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E4=B8=BAxlsx,=E4=B8=8E=E5=AF=BC=E5=85=A5=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/mem/WxCUserBasicInfoController.java | 2 +- .../com/iformall/controller/rent/WxBillDailyController.java | 2 +- .../src/main/java/com/iformall/service/ExcelService.java | 5 +++-- .../com/iformall/service/impl/WxBillAllServiceImpl.java | 6 +++--- .../com/iformall/service/impl/WxBillDailyServiceImpl.java | 2 +- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 6 +++--- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 2 +- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 2 +- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 2 +- .../iformall/service/impl/WxMerchantSubsidyServiceImpl.java | 2 +- .../java/com/iformall/service/impl/WxShopServiceImpl.java | 4 ++-- 11 files changed, 18 insertions(+), 17 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 678ecfd47..f731cf6af 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -333,7 +333,7 @@ public class WxCUserBasicInfoController extends BaseController { if (!targetFile.exists()) { targetFile.mkdirs(); } - String fileName = "1.xls"; + String fileName = "1.xlsx"; int dot = mFile.getOriginalFilename().lastIndexOf('.'); fileName = fileName + mFile.getOriginalFilename().substring(dot, mFile.getOriginalFilename().length()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index e5a7c25c1..42bebffef 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -144,7 +144,7 @@ public class WxBillDailyController extends BaseController { if (!targetFile.exists()) { targetFile.mkdirs(); } - String fileName = "bill_daily.xls"; + String fileName = "bill_daily.xlsx"; int dot = mFile.getOriginalFilename().lastIndexOf('.'); fileName = fileName + mFile.getOriginalFilename().substring(dot, mFile.getOriginalFilename().length()); diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java index 21563014c..91ed1a198 100644 --- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java +++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java @@ -33,12 +33,13 @@ public class ExcelService { { ExportParams exportParams = new ExportParams(title, sheetName); exportParams.setCreateHeadRows(isCreateHeader); + exportParams.setType(ExcelType.XSSF); defaultExport(list, pojoClass, fileName, response, exportParams); } public static void exportExcel(List list, String title, String sheetName, Class pojoClass,String fileName, HttpServletResponse response) { - defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName)); + defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF)); } public static void exportExcel(List> list, String fileName, HttpServletResponse response) @@ -56,7 +57,7 @@ public class ExcelService { private static void defaultExport(List> list, String fileName, HttpServletResponse response) { - Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.HSSF); + Workbook workbook = ExcelExportUtil.exportExcel(list, ExcelType.XSSF); if (workbook != null); downLoadExcel(fileName, response, workbook); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 6d5a11845..434a24149 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -248,7 +248,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { list.add(map); } - excelService.exportExcel(list, "账单数据.xls", response); + excelService.exportExcel(list, "账单数据.xlsx", response); } private int updateBillOtherDeposit(Map bill) { @@ -789,7 +789,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { list.add(oweMerchantVo); } String name = "欠缴商户列表"; - excelService.exportExcel(list,null, name, OweMerchantVo.class,name+".xls",response); + excelService.exportExcel(list,null, name, OweMerchantVo.class,name+".xlsx",response); } @Override @@ -812,6 +812,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { list.add(oweMerchantVo); } String name = "待缴商户列表"; - excelService.exportExcel(list,null, name, WaitMerchantVo.class,name+".xls",response); + excelService.exportExcel(list,null, name, WaitMerchantVo.class,name+".xlsx",response); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 84c090a0b..5adf56a0a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -238,7 +238,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { v2.setExpiredDay(0L); list.add(v2); - excelService.exportExcel(list, null, "水电费模板", WxBillDailyVo.class, "水电费模板.xls", response); + excelService.exportExcel(list, null, "水电费模板", WxBillDailyVo.class, "水电费模板.xlsx", response); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index e839d0da9..0ca091318 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -500,7 +500,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { String tagNames = StringUtils.join(ids.stream().map(id->tagMap.get(id)).collect(Collectors.toList()),"/"); u.setTagNames(tagNames); }); - excelService.exportExcel(list,null,"会员信息",WxCUserBasicInfoVo.class,"会员信息数据.xls",response); + excelService.exportExcel(list,null,"会员信息",WxCUserBasicInfoVo.class,"会员信息数据.xlsx",response); } public void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId) { @@ -575,7 +575,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { list.add(u2); list.add(u3); - excelService.exportExcel(list,null,"会员信息模板",WxCUserBasicInfoVo.class,"会员信息模板.xls",response); + excelService.exportExcel(list,null,"会员信息模板",WxCUserBasicInfoVo.class,"会员信息模板.xlsx",response); } @@ -826,7 +826,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { public void exportCarPayData(WxCarPayRecord record, HttpServletRequest request, HttpServletResponse response) { List list = wxCarPayRecordMapper.findCarPayList(record); String sheetName = (record.getIsPay()!=null && 1==record.getIsPay())?"线上缴费车辆列表":"进出车辆列表"; - excelService.exportExcel(list,null,sheetName,WxCarPayRecord.class,sheetName+".xls",response); + excelService.exportExcel(list,null,sheetName,WxCarPayRecord.class,sheetName+".xlsx",response); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 201d2a479..2dbd977b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -499,7 +499,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { @Override public void exportData(WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response) { List list = wxCardSpendMapper.findCardSpendVoList(wxCardSpendVo); - excelService.exportExcel(list,null,"消费记录",WxCardSpendVo.class,"消费记录.xls",response); + excelService.exportExcel(list,null,"消费记录",WxCardSpendVo.class,"消费记录.xlsx",response); } } 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 314517839..efe35eb30 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -271,7 +271,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxMall = wxMallMapper.findList(wxMall).get(0); String filename = wxMall.getName() + DateUtils.getSystemTime("yyyyMMDDHHmmss"); List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); - excelService.exportExcel(list, null, filename, WxCouponOrderBVo.class, filename + ".xls", response); + excelService.exportExcel(list, null, filename, WxCouponOrderBVo.class, filename + ".xlsx", response); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index f11d87558..cec6f9959 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -634,7 +634,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } }); - excelService.exportExcel(list,null,"商户信息",WxMerchant.class,"商户信息数据.xls",response); + excelService.exportExcel(list,null,"商户信息",WxMerchant.class,"商户信息数据.xlsx",response); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 89a172fee..b7bd35a61 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -82,7 +82,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { @Override public void exportData(WxMerchantSubsidy wxMerchantSubsidy, HttpServletRequest request, HttpServletResponse response) { List list = wxMerchantSubsidyMapper.findVoList(wxMerchantSubsidy); - excelService.exportExcel(list,null,"补贴记录",WxMerchantSubsidyVo.class,"补贴记录.xls",response); + excelService.exportExcel(list,null,"补贴记录",WxMerchantSubsidyVo.class,"补贴记录.xlsx",response); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index ea7db76d7..06151ab76 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -161,7 +161,7 @@ public class WxShopServiceImpl implements WxShopService { public void exportShop(WxShop wxShop, HttpServletRequest request, HttpServletResponse response) { List list = wxShopMapper.findListWithMerchantMap(wxShop); String name = EnumRentShopType.SHOP.getCode().equals(wxShop.getType())?"店铺列表":"多经点位列表"; - excelService.exportExcel(list,null, name, WxShopVo.class,name+".xls",response); + excelService.exportExcel(list,null, name, WxShopVo.class,name+".xlsx",response); } @Override @@ -184,6 +184,6 @@ public class WxShopServiceImpl implements WxShopService { notRentShopVoList.add(notRentShopVo); } String name = "未出租商铺列表"; - excelService.exportExcel(notRentShopVoList,null, name, WxNotRentShopVo.class,name+".xls",response); + excelService.exportExcel(notRentShopVoList,null, name, WxNotRentShopVo.class,name+".xlsx",response); } }