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

Merge branch 'release/个税版本' into custom/昂立

This commit is contained in:
Harryxzy 2023-11-02 17:25:58 +08:00
parent 14b5c65253 8f333c4ad4
commit a7ce66f522
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
View File

@ -307,9 +307,13 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
// 转换成po
SalaryAcctRecordPO salaryAcctRecordPO = SalaryAcctRecordBO.convert2PO(saveParam, salarySobCycleDTO, (int) acctTimes, (long) user.getUID());
//检查
// 检查是否能够新建核算
SalaryAcctTaxAgentPO build = SalaryAcctTaxAgentPO.builder().incomeCategory(salarySobPO.getIncomeCategory()).taxAgentId(salarySobPO.getTaxAgentId()).taxCycle(salaryAcctRecordPO.getTaxCycle()).build();
SalaryAcctTaxAgentPO build = SalaryAcctTaxAgentPO.builder()
.incomeCategory(salarySobPO.getIncomeCategory())
.taxAgentId(salarySobPO.getTaxAgentId())
.salaryMonth(salaryAcctRecordPO.getSalaryMonth())
.taxCycle(salaryAcctRecordPO.getTaxCycle())
.build();
List<SalaryAcctTaxAgentPO> salaryAcctTaxAgents = new ArrayList<>();
salaryAcctTaxAgents.add(build);
checkBeforeSave(salaryAcctRecordPO, salaryAcctTaxAgents);
@ -581,10 +585,10 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
.findAny()
.orElse(null);
if (Objects.nonNull(calculatedSalaryAcctTaxAgent)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(160506, "个税扣缴义务人「{0}」已经存在薪资所属月「{1}」的薪资核算记录了，无法新建薪资所属月「{2}」的薪资核算")
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(160506, "个税扣缴义务人「{0}」已经存在税款所属期「{1}」的薪资核算记录了，无法新建税款所属期「{2}」的薪资核算")
.replace("{0}", taxAgentMap.get(calculatedSalaryAcctTaxAgent.getTaxAgentId()))
.replace("{1}", SalaryDateUtil.getFormatYYYYMM(calculatedSalaryAcctTaxAgent.getSalaryMonth()))
.replace("{2}", SalaryDateUtil.getFormatYYYYMM(salaryAcctTaxAgent.getSalaryMonth())));
.replace("{1}", SalaryDateUtil.getFormatYYYYMM(calculatedSalaryAcctTaxAgent.getTaxCycle()))
.replace("{2}", SalaryDateUtil.getFormatYYYYMM(salaryAcctTaxAgent.getTaxCycle())));
}
}
}