From be85c47a6834746a5ed7a42f4805260cb6e3809c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sun, 7 Apr 2024 15:59:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E8=A1=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BB=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/TaxDeclareRecordService.java | 10 +++++++++- .../service/impl/TaxDeclareRecordServiceImpl.java | 11 ++++++----- .../salary/wrapper/TaxDeclareRecordWrapper.java | 12 ++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/service/TaxDeclareRecordService.java b/src/com/engine/salary/service/TaxDeclareRecordService.java index 911752afe..8d3c1fcba 100644 --- a/src/com/engine/salary/service/TaxDeclareRecordService.java +++ b/src/com/engine/salary/service/TaxDeclareRecordService.java @@ -194,8 +194,16 @@ public interface TaxDeclareRecordService { void updateById(TaxDeclareRecordPO taxDeclareRecord); + /** + * 获取申报记录状态列表 + * @param id + * @return + */ List getOrInitTaxReports(Long id); - + /** + * 更新申报状态，同时更新主记录 + * @param declareStatus + */ void updateTaxDeclareStatus(TaxDeclareStatusPO declareStatus); } diff --git a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java index afec5e507..822d12102 100644 --- a/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java @@ -720,7 +720,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe declareStatus.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARING.getValue()); declareStatus.setRequestId(declareTaxResponse.getBody().getRequestId()); declareStatus.setTaxDeclareErrorMsg(""); - getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus); + updateTaxDeclareStatus(declareStatus); // 记录日志 TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); @@ -851,7 +851,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe declareStatus.setTaxPayAmount(payAmount.subtract(purePaidAmount).toString()); } //更新申报状态 - getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus); + updateTaxDeclareStatus(declareStatus); // 如果申报失败 if (CollectionUtils.isNotEmpty(taxDeclareFails)) { @@ -922,7 +922,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe // 更新个税申报状态 declareStatus.setTaxDeclareStatus(TaxDeclareStatusEnum.DECLARE_CANCELLING.getValue()); declareStatus.setRequestId(declareTaxResponse.getBody().getRequestId()); - getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus); + updateTaxDeclareStatus(declareStatus); // 记录日志 TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); @@ -979,7 +979,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe //更新个税申报状态 declareStatus.setTaxDeclareStatus(taxDeclareStatusEnum.getValue()); declareStatus.setRequestId(""); - getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus); + updateTaxDeclareStatus(declareStatus); // 记录日志 TaxAgentPO taxAgent = taxDeclareRequest.getTaxAgent(); @@ -1084,6 +1084,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe @Override public void updateTaxDeclareStatus(TaxDeclareStatusPO declareStatus) { + //更新申报表状态 getTaxDeclareStatusMapper().updateIgnoreNull(declareStatus); //更新主记录 @@ -1239,7 +1240,7 @@ public class TaxDeclareRecordServiceImpl extends Service implements TaxDeclareRe } statuses.add(declareStatus); - personNum += declareStatus.getPersonNum(); + personNum += declareStatus.getPersonNum() == null ? 0 : declareStatus.getPersonNum(); taxPayAmount = taxPayAmount.add(SalaryEntityUtil.empty2Zero(declareStatus.getTaxPayAmount())); taxPaidAmount = taxPaidAmount.add(SalaryEntityUtil.empty2Zero(declareStatus.getTaxPaidAmount())); taxPurePaidAmount = taxPurePaidAmount.add(SalaryEntityUtil.empty2Zero(declareStatus.getTaxPurePaidAmount())); diff --git a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java index 7e0af4b9f..2ad459aa5 100644 --- a/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclareRecordWrapper.java @@ -31,6 +31,7 @@ import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.db.IdGenerator; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.SalaryPageUtil; +import com.engine.salary.util.valid.ValidUtil; import com.weaver.util.threadPool.ThreadPoolUtil; import com.weaver.util.threadPool.constant.ModulePoolEnum; import com.weaver.util.threadPool.entity.LocalRunnable; @@ -291,6 +292,8 @@ public class TaxDeclareRecordWrapper extends Service { * @return */ public List getTaxDeclarationTab(TaxDeclareRecordParam param) { + ValidUtil.doValidator(param); + // 查询个税申报记录 TaxDeclareRecordPO taxDeclareRecord = getTaxDeclareRecordService(user).getById(param.getTaxDeclareRecordId()); @@ -337,6 +340,8 @@ public class TaxDeclareRecordWrapper extends Service { * @return */ public TaxDeclarationInfoDTO getTaxDeclarationInfoById(TaxDeclareRecordParam param) { + ValidUtil.doValidator(param); + // 查询个税申报表 Long taxDeclareRecordId = param.getTaxDeclareRecordId(); TaxDeclareRecordPO taxDeclareRecord = getTaxDeclareRecordService(user).getById(taxDeclareRecordId); @@ -441,6 +446,8 @@ public class TaxDeclareRecordWrapper extends Service { * @param */ public String declare(TaxDeclareRecordParam taxDeclareRecordParam) { + ValidUtil.doValidator(taxDeclareRecordParam); + Long id = taxDeclareRecordParam.getTaxDeclareRecordId(); checkBefore(id); TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id)) @@ -470,6 +477,8 @@ public class TaxDeclareRecordWrapper extends Service { * 获取申报反馈 */ public String getDeclareFeedback(TaxDeclareRecordParam param) { + ValidUtil.doValidator(param); + Long id = param.getTaxDeclareRecordId(); checkBefore(id); TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id)) @@ -509,6 +518,7 @@ public class TaxDeclareRecordWrapper extends Service { * 作废 */ public String cancelDeclare(TaxDeclareRecordParam param) { + ValidUtil.doValidator(param); Long id = param.getTaxDeclareRecordId(); checkBefore(id); TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id)) @@ -538,6 +548,7 @@ public class TaxDeclareRecordWrapper extends Service { * 获取作废反馈 */ public String getCancelFeedback(TaxDeclareRecordParam param) { + ValidUtil.doValidator(param); Long id = param.getTaxDeclareRecordId(); checkBefore(id); TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id)) @@ -569,6 +580,7 @@ public class TaxDeclareRecordWrapper extends Service { * @return */ public String updateDeclare(TaxDeclareRecordParam param) { + ValidUtil.doValidator(param); Long id = param.getTaxDeclareRecordId(); checkBefore(id); TaxDeclarationRateDTO taxDeclarationRate = new TaxDeclarationRateDTO().setStatus(true).setIndex(Util.null2String(id))