diff --git a/src/com/engine/salary/action/UpdateSISchemeDetailAction.java b/src/com/engine/salary/action/UpdateSISchemeDetailAction.java index 2ceef43d0..0d406455a 100644 --- a/src/com/engine/salary/action/UpdateSISchemeDetailAction.java +++ b/src/com/engine/salary/action/UpdateSISchemeDetailAction.java @@ -183,6 +183,8 @@ public class UpdateSISchemeDetailAction implements Action { String validNum = importDataMap.getOrDefault("有效小数位", "").toString(); if (StringUtils.isNotBlank(validNum)) { targetSchemeDetailPO.setValidNum(Integer.valueOf(validNum)); + }else { + targetSchemeDetailPO.setValidNum(2); } String rententionRule = importDataMap.getOrDefault("进位规则", "").toString(); if (StringUtils.isNotBlank(rententionRule)) { diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 5eb07b4af..46abbf098 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -678,7 +678,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (po.getPaymentCycle() != null && po.getPaymentCycle() == 1) { @@ -755,7 +755,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -845,7 +845,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -921,7 +921,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -1014,7 +1014,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -1090,7 +1090,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -1596,7 +1596,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (po.getPaymentCycle() != null && po.getPaymentCycle() == 1) { @@ -1665,7 +1665,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -1746,7 +1746,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -1814,7 +1814,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -1899,7 +1899,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -1968,7 +1968,7 @@ public class SIAccountBiz extends Service { BigDecimal paymentProportion = new BigDecimal(StringUtils.isBlank(po.getPaymentProportion()) ? "0" : po.getPaymentProportion()).divide(new BigDecimal("100")); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(finalArchivesCom) || StringUtils.isBlank(finalArchivesCom.get(String.valueOf(e)))) ? "0" : finalArchivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -2056,7 +2056,7 @@ public class SIAccountBiz extends Service { // BigDecimal paymentNum = new BigDecimal(archivesPerson.get(String.valueOf(e))); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesPerson) || StringUtils.isBlank(archivesPerson.get(String.valueOf(e)))) ? "0" : archivesPerson.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { @@ -2127,7 +2127,7 @@ public class SIAccountBiz extends Service { // BigDecimal paymentNum = SalaryEntityUtil.string2BigDecimalDefault0(archivesCom.get(String.valueOf(e))); BigDecimal paymentNum = new BigDecimal((ObjectUtil.isEmpty(archivesCom) || StringUtils.isBlank(archivesCom.get(String.valueOf(e)))) ? "0" : archivesCom.get(String.valueOf(e))); BigDecimal fixedCost = StringUtils.isBlank(po.getFixedCost()) ? new BigDecimal("0") : new BigDecimal(po.getFixedCost()); - Integer newScale = po.getValidNum() == null ? 0 : po.getValidNum(); + Integer newScale = po.getValidNum() == null ? 2 : po.getValidNum(); // BigDecimal result = SalaryEntityUtil.carryRule(newScale, po.getRententionRule(), paymentNum.multiply(paymentProportion).add(fixedCost)); BigDecimal result = new BigDecimal("0"); if (Objects.equals(po.getPaymentCycle(), 1)) { diff --git a/src/com/engine/salary/biz/SISchemeBiz.java b/src/com/engine/salary/biz/SISchemeBiz.java index 686e617c8..f4b82614a 100644 --- a/src/com/engine/salary/biz/SISchemeBiz.java +++ b/src/com/engine/salary/biz/SISchemeBiz.java @@ -97,7 +97,7 @@ public class SISchemeBiz { insuranceSchemeDetailDTO.setInsuranceId(insuranceSchemeDetailPO.getInsuranceId()); insuranceSchemeDetailDTO.setPaymentScopeValue(insuranceSchemeDetailPO.getPaymentScope()); insuranceSchemeDetailDTO.setPrimaryId(insuranceSchemeDetailPO.getPrimaryId()); - insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum()); + insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum() == null ? 2 : insuranceSchemeDetailPO.getValidNum()); if (insuranceSchemeDetailPO.getIsPayment() != null) { insuranceSchemeDetailDTO.setIsPayment(Objects.equals(insuranceSchemeDetailPO.getIsPayment(), IsPaymentEnum.YES.getValue())); @@ -429,7 +429,7 @@ public class SISchemeBiz { .primaryId(batchPO.getId()) .rententionRule(item.getRententionRule()) .upperLimit(item.getUpperLimit()) - .validNum(item.getValidNum()) + .validNum(item.getValidNum()==null?2:item.getValidNum()) .build() ).collect(Collectors.toList()); encryptUtil.encryptList(detailPOS, InsuranceSchemeDetailPO.class); diff --git a/src/com/engine/salary/entity/sischeme/bo/InsuranceSchemeBO.java b/src/com/engine/salary/entity/sischeme/bo/InsuranceSchemeBO.java index 4b24e4021..f1f844e0d 100644 --- a/src/com/engine/salary/entity/sischeme/bo/InsuranceSchemeBO.java +++ b/src/com/engine/salary/entity/sischeme/bo/InsuranceSchemeBO.java @@ -76,7 +76,7 @@ public class InsuranceSchemeBO { .cycleSetting(item.getCycleSetting()) .accountType(Integer.parseInt(item.getAccountType())) .updateTime(new Date()) - .validNum(item.getValidNum()) + .validNum(item.getValidNum()==null ? 2 : item.getValidNum()) .build() ).collect(Collectors.toList()); } diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 1046dbdb4..f1fd51619 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -2326,7 +2326,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { insuranceSchemeDetailDTO.setInsuranceId(insuranceSchemeDetailPO.getInsuranceId()); insuranceSchemeDetailDTO.setPaymentScopeValue(insuranceSchemeDetailPO.getPaymentScope()); insuranceSchemeDetailDTO.setPrimaryId(insuranceSchemeDetailPO.getPrimaryId()); - insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum()); + insuranceSchemeDetailDTO.setValidNum(insuranceSchemeDetailPO.getValidNum() == null ? 2 : insuranceSchemeDetailPO.getValidNum()); if (insuranceSchemeDetailPO.getIsPayment() != null) { insuranceSchemeDetailDTO.setIsPayment(Objects.equals(insuranceSchemeDetailPO.getIsPayment(), IsPaymentEnum.YES.getValue())); @@ -2664,7 +2664,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { .primaryId(batchPO.getId()) .rententionRule(item.getRententionRule()) .upperLimit(item.getUpperLimit()) - .validNum(item.getValidNum()) + .validNum(item.getValidNum()==null?2:item.getValidNum()) .build() ).collect(Collectors.toList());