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

港湾

This commit is contained in:
Harryxzy 2024-01-04 15:50:14 +08:00
parent d9b87f0f5b
commit bb4b520140
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import com.engine.salary.entity.salarysob.po.SalarySobItemPO;
import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.enums.UserStatusEnum;
import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
import com.engine.salary.enums.salaryaccounting.LockStatusEnum;
import com.engine.salary.enums.salaryaccounting.SalaryAcctResultDataSourceEnum;
import com.engine.salary.enums.salaryitem.SalaryDataTypeEnum;
@ -1569,14 +1570,21 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
int mainId = rs.getInt("id");
// 获取明细数据
rs.execute("select * from uf_txjlgljmb_dt1 where mainid="+mainId);
Map<Long, DataCollectionEmployee> empMap = SalaryEntityUtil.convert2Map(getSalaryEmployeeService(user).listAll(UseEmployeeTypeEnum.ORG), DataCollectionEmployee::getEmployeeId);
while (rs.next()) {
Long empId = Long.valueOf(rs.getInt("xm"));
DataCollectionEmployee emp = empMap.getOrDefault(empId, DataCollectionEmployee.builder().username("").departmentName("").departmentId(0L).build());
result.add(pltxEmployeeDTO.builder()
.employee(Long.valueOf(rs.getInt("xm")))
.qnjxfs(rs.getDouble("qnjxfs"))
.jbgz(rs.getDouble("jbgz"))
.dx(rs.getDouble("dx"))
.dxhjbgz(rs.getDouble("dxhjbgz"))
.dxbl(rs.getDouble("dxbl"))
.employee(empId)
.employeeName(emp.getUsername())
.bmId(emp.getDepartmentId())
.bmName(emp.getDepartmentName())
.gskjywr(rs.getString("gskjywr"))
.qnjxfs(rs.getDouble("qnjxfs") == -1 ? null : rs.getDouble("qnjxfs"))
.jbgz(rs.getDouble("jbgz") == -1 ? null : rs.getDouble("jbgz"))
.dx(rs.getDouble("dx") == -1 ? null : rs.getDouble("dx"))
.dxhjbgz(rs.getDouble("dxhjbgz") == -1 ? null : rs.getDouble("dxhjbgz"))
.dxbl(rs.getDouble("dxbl") == -1 ? null : rs.getDouble("dxbl"))
.build());
}
}