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:
钱涛 2026-02-11 17:50:07 +08:00
parent 1d27ad85c3 d3c0dbe7d7
commit 2b8f1df51f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -672,7 +672,12 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla
getEmployeeDeclareRecordService(user).deleteByTaxCycleAndTaxAgentId(param.getTaxCycle(), param.getTaxAgentId());
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(156449, "服务异常"));
}
if (SzyhApiConstant.HANDLING_CODE.equals(declareEmployeeFeedbackResponse.getHead().getCode()) || SzyhApiConstant.TASK_HANDLING_CODE.equals(declareEmployeeFeedbackResponse.getHead().getCode())) {
//进行中的任务，重试
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(175337, "任务还在处理中，请稍后点击获取报送结果"));
}
if (!Objects.equals(declareEmployeeFeedbackResponse.getHead().getCode(), SzyhApiConstant.SUCCESS_CODE)) {
log.error("人员报送服务错误:" + res);
// 删除原来的人员报送记录
getEmployeeDeclareRecordService(user).deleteByTaxCycleAndTaxAgentId(param.getTaxCycle(), param.getTaxAgentId());
throw new SalaryRunTimeException(declareEmployeeFeedbackResponse.getHead().getMsg());