税后工资

This commit is contained in:
钱涛 2024-07-17 13:37:39 +08:00
parent 08c30c292b
commit f40d2bec91
1 changed files with 13 additions and 6 deletions

View File

@ -973,15 +973,22 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
// 9计算薪资项目的运算优先级
List<Long> salarySobItemsWithPriority = sortItems(salarySobItemPOS, salarySobBackItems, salaryItemPOS, expressFormulas);
//核算税后逻辑去除非税后项目
List<Long> afterTaxItems = new ArrayList<>();
afterTaxItems.add(1695204436147L);
salarySobItemsWithPriority = salarySobItemsWithPriority.stream().filter(afterTaxItems::contains).collect(Collectors.toList());
//账套中配置的个税字段不需要系统算
List<SalarySobTaxRulePO> salarySobTaxRulePOS = getSalarySobTaxRuleService(user).listBySalarySobId(salaryAcctRecordPO.getSalarySobId());
List<Long> taxIds = SalaryEntityUtil.properties(salarySobTaxRulePOS, SalarySobTaxRulePO::getSalaryItemId, Collectors.toList());
/**
* 计算税后薪资
*/
int index = salarySobItemsWithPriority.size() - 1;
for (Long id : taxIds) {
int i = salarySobItemsWithPriority.indexOf(id);
if (i != -1 && i < index) {
index = i;
}
}
salarySobItemsWithPriority = salarySobItemsWithPriority.subList(index, salarySobItemsWithPriority.size());
// 10根据id查询其他合并计税的薪资核算记录
List<SalaryAcctRecordPO> otherSalaryAcctRecordPOS = getSalaryAcctRecordService(user).listById4OtherConsolidatedTax(salaryAcctRecordPO.getId());
// 11查询本次核算人员
@ -1065,7 +1072,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
return;
}
// 15处理核算结果临时表数据
handleSalaryAfterTaxAcctResultTemp(salaryAcctRecordId, calculateKey, afterTaxItems);
handleSalaryAfterTaxAcctResultTemp(salaryAcctRecordId, calculateKey,salarySobItemsWithPriority);
// 16开始运行校验规则
// SalaryAcctCheckParam salaryAcctCheckParam = new SalaryAcctCheckParam()
// .setSalaryAcctRecordId(calculateParam.getSalaryAcctRecordId())