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

福利的重新核算功能异常

This commit is contained in:
钱涛 2022-09-21 11:12:05 +08:00
parent b06eae55d8
commit 0045a0dd59
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -987,11 +987,12 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
@Override
public void socialSecurityBenefitsRecalculate(InsuranceAccountBatchPO param) {
int num = getSiAccountBiz(user).checkIfBusinessaccounting(param);
//表示已经被核算过不能重新核算
if (num > 0) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "已被薪酬核算给核算过，无法重新核算！"));
}
//fixme 重新核算的校验逻辑 1、先取台账对应扣缴义务人下的所有账套 2、取账套下所有核算记录 3、判断核算记录有没有使用对应月份的福利台账
// int num = getSiAccountBiz(user).checkIfBusinessaccounting(param);
// //表示已经被核算过不能重新核算
// if (num > 0) {
// throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98831, "已被薪酬核算给核算过，无法重新核算！"));
// }
param.setBillStatus(0);
getSiAccountBiz(user).updateById(param);
}

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

@ -127,6 +127,9 @@ public class SalaryArchiveItemServiceImpl extends Service implements SalaryArchi
throw new SalaryRunTimeException("薪资档案不存在！");
}
// 获取当前已生效数据
List<SalaryArchiveItemPO> effectiveSalaryItems = getEffectiveSalaryItems(salaryArchiveId, salaryItemIds);