From fcf04833653e67de8ce91e4001cc0a4ad48c6109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 3 Jan 2024 13:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=94=B3=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/enums/taxdeclaration/TaxDeclareStatusEnum.java | 1 + .../salary/service/impl/TaxDeclareRecordServiceImpl.java | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/engine/salary/enums/taxdeclaration/TaxDeclareStatusEnum.java b/src/com/engine/salary/enums/taxdeclaration/TaxDeclareStatusEnum.java index 27db64998..1335ff349 100644 --- a/src/com/engine/salary/enums/taxdeclaration/TaxDeclareStatusEnum.java +++ b/src/com/engine/salary/enums/taxdeclaration/TaxDeclareStatusEnum.java @@ -12,6 +12,7 @@ import com.engine.salary.enums.BaseEnum; **/ public enum TaxDeclareStatusEnum implements BaseEnum { + DECLARE_FAIL_UNFILLED(0, "未填写", 160495), NOT_DECLARE(1, "未申报", 160495), DECLARING(2, "申报中", 160496), DECLARE_FAIL(3, "申报失败", 160494), diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java index 29df68b25..2bd0b49ca 100644 --- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java @@ -721,7 +721,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe throw new SalaryRunTimeException(declareTaxFeedbackResponse.getHead().getMsg()); } // 申报反馈状态 - Integer declareFeedbackStatus = SalaryEntityUtil.getIntValue(declareTaxFeedbackResponse.getBody().get("fkztbj"), 0); + Integer declareFeedbackStatus = SalaryEntityUtil.getIntValue(declareTaxFeedbackResponse.getBody().get("fkztbj"), -1); DeclareFeedBackStatusEnum declareFeedBackStatusEnum = SalaryEnumUtil.enumMatchByValue(declareFeedbackStatus, DeclareFeedBackStatusEnum.class); if (declareFeedBackStatusEnum == null) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(156509, "服务异常，接口返回数据有误")); @@ -768,7 +768,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe taxDeclareRecord.setTaxDeclareErrorMsg(""); } // 申报状态 - Integer declareStatus = SalaryEntityUtil.getIntValue(declareTaxFeedbackResponse.getBody().get("sbztbj"), 0); + Integer declareStatus = SalaryEntityUtil.getIntValue(declareTaxFeedbackResponse.getBody().get("sbztbj"), -1); TaxDeclareStatusEnum taxDeclareStatusEnum = SalaryEnumUtil.enumMatchByValue(declareStatus, TaxDeclareStatusEnum.class); if (taxDeclareStatusEnum == null) { throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(156509, "服务异常，接口返回数据有误")); @@ -1018,8 +1018,6 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe } - - @Override public void cancelCorrect(Long id) { TaxDeclareRequest taxDeclareRequest = buildTaxDeclareRequest(id);