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

调薪日志

This commit is contained in:
钱涛 2026-03-17 17:38:51 +08:00
parent 63f833d9d8
commit 0837b56174
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
View File

@ -634,7 +634,6 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
// 4.数据入库处理 // 4.数据入库处理
if (param.isAddData()) { if (param.isAddData()) {
handleImportData(importHandleParam); handleImportData(importHandleParam);
log.info("processInit4 handleImportData:{}", importHandleParam);
} }
Map<String, Object> apidatas = new HashMap<>(); Map<String, Object> apidatas = new HashMap<>();
@ -664,6 +663,7 @@ public class SalaryArchiveExcelServiceImpl extends Service implements SalaryArch
String importType = param.getImportType(); String importType = param.getImportType();
// 获取所有可被引用的薪资项目 // 获取所有可被引用的薪资项目
log.info("getCanAdjustSalaryItems param:{}", param);
List<SalaryItemPO> salaryItems = salaryArchiveItemService(user).getCanAdjustSalaryItems(); List<SalaryItemPO> salaryItems = salaryArchiveItemService(user).getCanAdjustSalaryItems();
Collection<Long> salaryItemIds = salaryItems.stream().map(SalaryItemPO::getId).collect(Collectors.toList()); Collection<Long> salaryItemIds = salaryItems.stream().map(SalaryItemPO::getId).collect(Collectors.toList());
Collection<TaxAgentManageRangeEmployeeDTO> taxAgentList; Collection<TaxAgentManageRangeEmployeeDTO> taxAgentList;

2
src/com/engine/salary/service/impl/SalaryArchiveItemServiceImpl.java
View File

@ -639,11 +639,13 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
List<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentList, TaxAgentPO::getId, Collectors.toList()); List<Long> taxAgentIds = SalaryEntityUtil.properties(taxAgentList, TaxAgentPO::getId, Collectors.toList());
List<SalaryItemPO> canAdjustSalaryItems = salaryItemMapper.getCanAdjustSalaryItems(); List<SalaryItemPO> canAdjustSalaryItems = salaryItemMapper.getCanAdjustSalaryItems();
log.info("getCanAdjustSalaryItems1:{}", canAdjustSalaryItems);
canAdjustSalaryItems = canAdjustSalaryItems.stream() canAdjustSalaryItems = canAdjustSalaryItems.stream()
.filter(item -> item.getSharedType() == null .filter(item -> item.getSharedType() == null
|| 0 == item.getSharedType() || 0 == item.getSharedType()
|| (StringUtils.isNotBlank(item.getTaxAgentIds()) && SalaryEntityUtil.judgeIntersection(taxAgentIds, Arrays.stream(item.getTaxAgentIds().split(",")).map(Long::valueOf).collect(Collectors.toList())))) || (StringUtils.isNotBlank(item.getTaxAgentIds()) && SalaryEntityUtil.judgeIntersection(taxAgentIds, Arrays.stream(item.getTaxAgentIds().split(",")).map(Long::valueOf).collect(Collectors.toList()))))
.collect(Collectors.toList()); .collect(Collectors.toList());
log.info("getCanAdjustSalaryItems2:{} taxAgentIds:{}", canAdjustSalaryItems, taxAgentIds);
return canAdjustSalaryItems; return canAdjustSalaryItems;
} }