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

Merge branch 'hotfix/0801' into develop

This commit is contained in:
钱涛 2022-08-24 14:49:57 +08:00
parent 7dfe9ee732 1567ecb956
commit 378d3a49e9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -37,6 +37,7 @@ import com.engine.salary.util.valid.ValidUtil;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.wbi.util.Util;
import dm.jdbc.util.IdGenerator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@ -265,6 +266,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
/**
* 报表表头
*
* @param salaryAcctRecordPO
* @return
*/
@ -733,10 +735,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
}
for (SalaryAcctResultReportPO po : salaryAcctResultReportOfOneEmp) {
po.setEmployeeId(employeeId.toString());
po.setEmployeeId(Util.null2String(employeeId));
po.setTaxAgentId(taxAgentId);
po.setSalaryAcctEmpId(salaryAcctEmpId.toString());
po.setSalaryAcctEmpId(Util.null2String(salaryAcctEmpId));
DataCollectionEmployee emp = emps.get(employeeId);
po.setSubcompanyId(emp.getSubcompanyid());