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

1、减少人员bug 

2、档案项目输入bug
This commit is contained in:
钱涛 2023-11-13 17:12:25 +08:00
parent f3bc735fae
commit 2c12b10171
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
View File

@ -291,11 +291,13 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
List<SalaryAcctEmployeePO> salaryAcctEmployeePOS = listByParam(queryParam);
Set<String> keySet = SalaryEntityUtil.properties(salaryAcctEmployeePOS, salaryAcctEmployeePO -> salaryAcctEmployeePO.getEmployeeId() + "-" + salaryAcctEmployeePO.getTaxAgentId());
List<SalaryAcctEmployeePO> resultList = Lists.newArrayList();
lastMonthSalaryAcctEmployeePOMap.forEach((k, v) -> {
if (!keySet.contains(k)) {
resultList.add(v);
}
});
if(CollectionUtils.isNotEmpty(keySet)){
lastMonthSalaryAcctEmployeePOMap.forEach((k, v) -> {
if (!keySet.contains(k)) {
resultList.add(v);
}
});
}
return resultList;
}

1
src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
View File

@ -111,6 +111,7 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt
Map<String, Object> salaryItemMap = new LinkedHashMap<>();
salaryItemMap.put("id", String.valueOf(m.getId()));
salaryItemMap.put("content", m.getName());
salaryItemMap.put("dataType", m.getDataType());
return salaryItemMap;
}).collect(Collectors.toList());