diff --git a/src/com/engine/salary/service/impl/SettingServiceImpl.java b/src/com/engine/salary/service/impl/SettingServiceImpl.java index 7019212bc..3a2395b01 100644 --- a/src/com/engine/salary/service/impl/SettingServiceImpl.java +++ b/src/com/engine/salary/service/impl/SettingServiceImpl.java @@ -358,18 +358,17 @@ public class SettingServiceImpl extends Service implements SettingService { @Override public XSSFWorkbook downloadPageExportTemplateFile(DownloadTemplateParam param) { - List> rowList = new ArrayList<>(); + List> rowList = new ArrayList<>(); List heads = param.getHeads(); List setting = param.getSetting(); - if (CollUtil.isEmpty(heads)||CollUtil.isEmpty(setting)||Objects.equals(heads.size(), setting.size())){ + if (CollUtil.isEmpty(heads)||CollUtil.isEmpty(setting)||!Objects.equals(heads.size(), setting.size())){ throw new SalaryRunTimeException("未选择字段"); } - - rowList.add(Collections.singletonList(heads)); setting = setting.stream().map(s -> String.format("{.%s}", s)).collect(Collectors.toList()); - rowList.add(Collections.singletonList(setting)); + rowList.add(heads); + rowList.add(setting); - return ExcelUtilPlus.genWorkbookV2(rowList, "薪资明细"); + return ExcelUtilPlus.genWorkbook(rowList, "薪资明细"); } @Override diff --git a/src/com/engine/salary/web/SalaryCommonController.java b/src/com/engine/salary/web/SalaryCommonController.java index 7fa7e1ac4..8e47a22d6 100644 --- a/src/com/engine/salary/web/SalaryCommonController.java +++ b/src/com/engine/salary/web/SalaryCommonController.java @@ -161,7 +161,7 @@ public class SalaryCommonController { XSSFWorkbook workbook = getSalaryCommonWrapper(user).downloadPageExportTemplateFile(param); - String fileName = "薪资明细模板" + LocalDate.now(); + String fileName = "薪资明细模板示例" + LocalDate.now(); try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) {