Skip to content

Y
yifu-mvp
Commit bb9cc889 authored by hongguangwu's avatar hongguangwu
Browse files
Options

代扣，只能金额

parent 084a3a21
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java
View file @ bb9cc889
...@@ -197,12 +197,14 @@ public class SalaryAccountUtil implements Serializable { ...@@ -197,12 +197,14 @@ public class SalaryAccountUtil implements Serializable {
} }
if (SalaryConstants.PDEDUCTION_JAVA.equals(scs.getJavaFiedName()) if (SalaryConstants.PDEDUCTION_JAVA.equals(scs.getJavaFiedName())
|| SalaryConstants.UDEDUCTION_JAVA.equals(scs.getJavaFiedName()) || SalaryConstants.UDEDUCTION_JAVA.equals(scs.getJavaFiedName())
|| SalaryConstants.ENTERPRISE_ANNUITY_JAVA.equals(scs.getJavaFiedName())
|| SalaryConstants.ENTERPRISE_ANNUITY_UNIT_JAVA.equals(scs.getJavaFiedName())
|| scs.getJavaFiedName().contains(SalaryConstants.WITHHOLIDING)) { || scs.getJavaFiedName().contains(SalaryConstants.WITHHOLIDING)) {
try { try {
new BigDecimal(cellValueStr.replace(",","")); new BigDecimal(cellValueStr.replace(",",""));
} catch (Exception ex) { } catch (Exception ex) {
errorFlag = false; errorFlag = false;
error = "第" + (i + 2) + "行：代扣，只能是金额！"; error = "第" + (i + 2) + "行：代扣、企业年金，只能是金额！";
errorList.add(new ErrorMessage((i + 2), error)); errorList.add(new ErrorMessage((i + 2), error));
continue; continue;
} }
......
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryConstants.java
View file @ bb9cc889
...@@ -160,6 +160,7 @@ public class SalaryConstants { ...@@ -160,6 +160,7 @@ public class SalaryConstants {
public static final String EXEMPTION_PERSION_TAX_JAVA = "exemptionPersionTax"; public static final String EXEMPTION_PERSION_TAX_JAVA = "exemptionPersionTax";
//企业（职业）年金 //企业（职业）年金
public static final String ENTERPRISE_ANNUITY_JAVA = "enterpriseAnnuity"; public static final String ENTERPRISE_ANNUITY_JAVA = "enterpriseAnnuity";
public static final String ENTERPRISE_ANNUITY_UNIT_JAVA = "enterpriseAnnuityUnit";
//风险抵押金 //风险抵押金
public static final String RISK_MORTGAGE_MONEY_JAVA = "riskMortgageMoney"; public static final String RISK_MORTGAGE_MONEY_JAVA = "riskMortgageMoney";
//单位补足扣返 //单位补足扣返
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment