Merge remote-tracking branch 'origin/dailyfix' into dailyfix

This commit is contained in:
maliang 2021-06-10 14:20:44 +08:00
commit 78508faa33
3 changed files with 5 additions and 1 deletions

View File

@ -75,7 +75,7 @@
<div class="item col-xs-12">
<span class="intelligent-label f-fl"><b class="ftx04">*</b>证件号码:</span>
<div class="f-fl item-ifo">
<input type="text" name="idCard" class="txt03 f-r3 required" onkeyup="validateIdCard();" data-valid="isNonEmpty||isSame:certIdShort" data-error="身份证号不能为空||身份证号不一致" tabindex="2" id="idCard" />
<input type="text" name="idCard" class="txt03 f-r3 required" onkeyup="validateIdCard();" data-valid="isNonEmpty||isSame:certIdShort" data-error="身份证号不能为空||身份证号不一致,请填写身份证后六位" tabindex="2" id="idCard" />
<label class="focus" id="validateCard">请填写身份证后六位</label>
<label class="focus valid"></label>
</div>

View File

@ -356,6 +356,8 @@ public class PlatformDataToTemp extends BaseBussiness {
incidentalReferB = new BigDecimal(pccBo.getAttribute("INCIDENTAL").toString()).divide(new BigDecimal(pccBo.getAttribute("EQUIP_AMT").toString()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
} else if ("TOTAL_ALL".equals(incidentalRefer)) {
incidentalReferB = new BigDecimal(pccBo.getAttribute("INCIDENTAL").toString()).divide(totalAll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
} else if ("EquipEndAmt".equals(cautionMoneyRefer)) {
incidentalReferB = new BigDecimal(pccBo.getAttribute("INCIDENTAL").toString()).divide(totalAll.subtract(new BigDecimal(pccBo.getAttribute("FIRST_PAYMENT").toString())), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
}
/**ÓâÆÚ·£Ï¢±ÈÀý*/
String PENA_RATE = ProductParamUtil.getProductParameterValue(productId, "PRD0308", "PENALTY_RATE_DAY", "PENALTY_RATE_DAY");

View File

@ -163,6 +163,8 @@ public class PlatformDataToTempNotKjflc extends BaseBussiness {
incidentalReferB = new BigDecimal(lcctBo.getAttribute("INCIDENTAL").toString()).divide(new BigDecimal(lcctBo.getAttribute("EQUIP_AMT").toString()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
} else if ("TOTAL_ALL".equals(incidentalRefer)) {
incidentalReferB = new BigDecimal(lcctBo.getAttribute("INCIDENTAL").toString()).divide(totalAll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
} else if ("EquipEndAmt".equals(cautionMoneyRefer)) {
incidentalReferB = new BigDecimal(lcctBo.getAttribute("INCIDENTAL").toString()).divide(totalAll.subtract(new BigDecimal(lcctBo.getAttribute("FIRST_PAYMENT").toString())), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
}
/**ÓâÆÚ·£Ï¢±ÈÀý*/
String PENA_RATE = ProductParamUtil.getProductParameterValue(productId, "PRD0308", "PENALTY_RATE_DAY", "PENALTY_RATE_DAY");