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

联特修复已推送状态

This commit is contained in:
Harryxzy 2025-06-10 10:39:13 +08:00
parent 5aefe5272d
commit 6b5aebb6dd
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -768,8 +768,8 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98747, "薪资核算记录不存在或已被删除"));
}
if (salaryAcctRecordPO.getStatus().equals(SalaryAcctRecordStatusEnum.PUSHED.getValue())) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "薪资核算记录已为已推送状态，不能重新核算"));
if (salaryAcctRecordPO.getStatus().equals(SalaryAcctRecordStatusEnum.PUSHED.getValue()) || salaryAcctRecordPO.getStatus().equals(SalaryAcctRecordStatusEnum.DECLARED.getValue())) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0, "薪资核算记录已为已推送或已申报状态，不能重新核算"));
}
// 重新核算
reCalcOrBackCalc(salaryAcctRecordPO, true);

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

@ -518,7 +518,10 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe
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())
|| Objects.equals(salaryAcctRecordPO.getStatus(), SalaryAcctRecordStatusEnum.PUSHED.getValue()))
.collect(Collectors.toList());
// 无已归档的薪资核算记录，不允许生成个税申报表
if (CollectionUtils.isEmpty(archivedSalaryAcctRecords)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(177860, "{0}无可申报数据").replace("{0}", SalaryDateUtil.getFormatYearMonth(saveParam.getSalaryMonth())));