From e48c74b2e2853da2e2c80b621997f27ffdb22447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sat, 8 Feb 2025 15:12:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A8=A1=E6=9D=BF=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E5=88=97=E5=90=88=E5=B9=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SettingServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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