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

汇通 修改导出表名

This commit is contained in:
Harryxzy 2025-02-18 16:43:32 +08:00
parent 520b2bd8ee
commit 46e260fb77
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/engine/salary/web/SalaryAcctController.java
View File

@ -1,12 +1,15 @@
package com.engine.salary.web;
import com.engine.common.util.ServiceUtil;
import com.engine.salary.entity.hrm.SubCompanyInfo;
import com.engine.salary.entity.salaryacct.dto.*;
import com.engine.salary.entity.salaryacct.param.*;
import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
import com.engine.salary.service.SalaryAcctExcelService;
import com.engine.salary.service.SalaryEmployeeService;
import com.engine.salary.service.impl.SalaryAcctExcelServiceImpl;
import com.engine.salary.service.impl.SalaryEmployeeServiceImpl;
import com.engine.salary.util.ResponseResult;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.excel.ExcelPreviewDTO;
@ -30,10 +33,7 @@ import javax.ws.rs.core.StreamingOutput;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -72,6 +72,10 @@ public class SalaryAcctController {
return ServiceUtil.getService(SalaryAcctExcelServiceImpl.class, user);
}
private SalaryEmployeeService getSalaryEmployeeService(User user) {
return ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user);
}
// /**********************************薪资核算记录相关 start*********************************/
//薪资核算列表
@ -975,7 +979,8 @@ public class SalaryAcctController {
try {
User user = HrmUserVarify.getUser(request, response);
XSSFWorkbook workbook = getSalaryAcctExcelWrapper(user).exportHtjsXcssDataDetail(param);
String fileName = "薪酬送审" + LocalDate.now();
SubCompanyInfo subCompanyInfo = getSalaryEmployeeService(user).getSubCompanyInfoById(param.getSubcompanyId());
String fileName = subCompanyInfo == null ? "" : subCompanyInfo.getName() + SalaryDateUtil.getFormatYearMonth(new Date());
try {
fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8");
} catch (UnsupportedEncodingException e) {