From 83da142ac1597a633f82cc59df3d790048d6da9a Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 26 Feb 2025 15:32:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=87=E4=BC=97=E6=8A=A5=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalaryAcctResultServiceImpl.java | 2 +- src/com/engine/salary/web/SalaryAcctController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index c63daccfd..f815aa581 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1562,7 +1562,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe rows.add(rowList); } - return ExcelUtilPlus.genWorkbook4Wz(rows, "薪酬报表", false); + return ExcelUtilPlus.genWorkbook4Wz(rows, "月度工资计提表-财务使用", false); } return null; } diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 0b74112d7..f050d7aa3 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -1071,7 +1071,7 @@ public class SalaryAcctController { } XSSFWorkbook workbook = getSalaryAcctResultWrapper(user).exportDhSalaryReport(salaryMonth); String time = LocalDate.now().toString(); - String fileName = "薪酬报表" + time; + String fileName = "月度工资计提表-财务使用" + time; try { fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8"); } catch (UnsupportedEncodingException e) { @@ -1084,7 +1084,7 @@ public class SalaryAcctController { response.setContentType("application/octet-stream"); return Response.ok(output).header("Content-disposition", "attachment;filename=" + fileName).header("Cache-Control", "no-cache").build(); } catch (Exception e) { - log.error("薪酬报表", e); + log.error("月度工资计提表-财务使用", e); throw e; } }