diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java index e0da1fdfc..3a448f64a 100644 --- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java +++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java @@ -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());