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

个税调差累计字段对应

This commit is contained in:
钱涛 2023-10-23 14:44:26 +08:00
parent 026fa54a0e
commit fe4e138317
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
View File

@ -283,7 +283,8 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
deleteByIds(needDeleteTaxDeclareRecordIds); deleteByIds(needDeleteTaxDeclareRecordIds);
// 保存个税申报记录 // 保存个税申报记录
if (CollectionUtils.isNotEmpty(newTaxDeclareRecords)) { if (CollectionUtils.isNotEmpty(newTaxDeclareRecords)) {
getTaxDeclareRecordMapper().batchInsert(newTaxDeclareRecords); newTaxDeclareRecords.forEach(getTaxDeclareRecordMapper()::insertIgnoreNull);
// getTaxDeclareRecordMapper().batchInsert(newTaxDeclareRecords);
} }
// 保存个税申报表 // 保存个税申报表
if (CollectionUtils.isNotEmpty(newTaxDeclarations)) { if (CollectionUtils.isNotEmpty(newTaxDeclarations)) {
@ -431,7 +432,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
// 如果存在未归档的薪资核算记录，不允许生成个税申报表 // 如果存在未归档的薪资核算记录，不允许生成个税申报表
boolean notArchived = salaryAcctRecords.stream().anyMatch(salaryAcctRecordPO -> Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue())); boolean notArchived = salaryAcctRecords.stream().anyMatch(salaryAcctRecordPO -> Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue()));
if (notArchived) { if (notArchived) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98875, "{0}有未归档数据，请全部归档后再申报").replace("{0}", saveParam.getSalaryMonth().toString())); throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98875, "{0}有未归档数据，请全部归档后再申报").replace("{0}", SalaryDateUtil.getFormatYearMonth(saveParam.getSalaryMonth())));
} }
// 查询已归档的薪资核算记录 // 查询已归档的薪资核算记录
List<SalaryAcctRecordPO> archivedSalaryAcctRecords = salaryAcctRecords.stream().filter(salaryAcctRecordPO -> Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.ARCHIVED.getValue())).collect(Collectors.toList()); List<SalaryAcctRecordPO> archivedSalaryAcctRecords = salaryAcctRecords.stream().filter(salaryAcctRecordPO -> Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.ARCHIVED.getValue())).collect(Collectors.toList());