diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 826ce13db..cb0da89a9 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -2916,6 +2916,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (personalOptional.isPresent() && StringUtils .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(87159, "个人")))) { String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(87159, "个人")); + if (perNumString.length() > 0 && !isNumeric(perNumString)) { + continue; + } + perNumString = perNumString.replace(",", ""); BigDecimal result = new BigDecimal(perNumString); socialPerJsonMap.put(String.valueOf(personalOptional.get().getId()), result.toPlainString()); @@ -2939,6 +2943,10 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (personalOptional.isPresent() && StringUtils .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")))) { String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")); + + if (perNumString.length() > 0 && !isNumeric(perNumString)) { + continue; + } perNumString = perNumString.replace(",", ""); BigDecimal result = new BigDecimal(perNumString); sociaComJsonMap.put(String.valueOf(personalOptional.get().getId()), result.toPlainString()); @@ -2968,6 +2976,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (personalOptional.isPresent() && StringUtils .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(87159, "个人")))) { String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(87159, "个人")); + if (perNumString.length() > 0 && !isNumeric(perNumString)) { + continue; + } perNumString = perNumString.replace(",", ""); BigDecimal result = new BigDecimal(perNumString); fundPerJsonMap.put(String.valueOf(personalOptional.get().getId()), result.toPlainString()); @@ -2991,6 +3002,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (personalOptional.isPresent() && StringUtils .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")))) { String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")); + if (perNumString.length() > 0 && !isNumeric(perNumString)) { + continue; + } perNumString = perNumString.replace(",", ""); BigDecimal result = new BigDecimal(perNumString); fundComJsonMap.put(String.valueOf(personalOptional.get().getId()), result.toPlainString()); @@ -3020,6 +3034,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (personalOptional.isPresent() && StringUtils .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(87159, "个人")))) { String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(87159, "个人")); + if (perNumString.length() > 0 && !isNumeric(perNumString)) { + continue; + } perNumString = perNumString.replace(",", ""); BigDecimal result = new BigDecimal(perNumString); otherPerJsonMap.put(String.valueOf(personalOptional.get().getId()), result.toPlainString()); @@ -3043,6 +3060,9 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (personalOptional.isPresent() && StringUtils .isNotBlank((String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")))) { String perNumString = (String) stringObjectMap.get(personalOptional.get().getInsuranceName() + SalaryI18nUtil.getI18nLabel(100289, "单位")); + if (perNumString.length() > 0 && !isNumeric(perNumString)) { + continue; + } perNumString = perNumString.replace(",", ""); BigDecimal result = new BigDecimal(perNumString); otherComJsonMap.put(String.valueOf(personalOptional.get().getId()), result.toPlainString());