qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/2.19.1.2501.01' into release/2.19.1.2501.01

This commit is contained in:
Harryxzy 2025-02-11 09:23:15 +08:00
parent 06e117f3aa 54559b198b
commit 9c419f09bf
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/engine/salary/service/impl/SettingServiceImpl.java
View File

@ -358,18 +358,17 @@ public class SettingServiceImpl extends Service implements SettingService {
@Override
public XSSFWorkbook downloadPageExportTemplateFile(DownloadTemplateParam param) {
List<List<Object>> rowList = new ArrayList<>();
List<List<String>> rowList = new ArrayList<>();
List<String> heads = param.getHeads();
List<String> 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

2
src/com/engine/salary/web/SalaryCommonController.java
View File

@ -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) {