diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryCalcTaxInfoDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryCalcTaxInfoDTO.java index 554f98f9d..ff19dd7ec 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryCalcTaxInfoDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryCalcTaxInfoDTO.java @@ -10,11 +10,6 @@ import lombok.Data; @Data public class SalaryCalcTaxInfoDTO { - /** - * 是否开启智能算薪 - */ - private boolean enableTaxDeclarationApiConfig; - /** * 是否显示计算个税按钮 */ @@ -24,4 +19,9 @@ public class SalaryCalcTaxInfoDTO { * 是否显示获取个税计算反馈按钮 */ private boolean showCalcTaxFeedbackButton; + + /** + * 是否显示核算税后薪资按钮 + */ + private boolean showCalcAfterTaxButton; } diff --git a/src/com/engine/salary/service/impl/SalaryCalcTaxServiceImpl.java b/src/com/engine/salary/service/impl/SalaryCalcTaxServiceImpl.java index 2ee4b657e..ce13407f1 100644 --- a/src/com/engine/salary/service/impl/SalaryCalcTaxServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryCalcTaxServiceImpl.java @@ -98,9 +98,9 @@ public class SalaryCalcTaxServiceImpl extends Service implements SalaryCalcTaxSe boolean showCalcTaxFeedbackButton = enableTaxDeclarationApiConfig && CollectionUtils.isNotEmpty(salaryAcctCalcTaxReqs); SalaryCalcTaxInfoDTO salaryCalcTaxInfo = new SalaryCalcTaxInfoDTO(); - salaryCalcTaxInfo.setEnableTaxDeclarationApiConfig(enableTaxDeclarationApiConfig); salaryCalcTaxInfo.setShowCalcTaxButton(showCalcTaxButton); salaryCalcTaxInfo.setShowCalcTaxFeedbackButton(showCalcTaxFeedbackButton); + salaryCalcTaxInfo.setShowCalcAfterTaxButton(showCalcTaxFeedbackButton); return salaryCalcTaxInfo; }