From dcb907b79e5741d726668aa21b6e4729968e073d Mon Sep 17 00:00:00 2001 From: gityjf <2211675158@qq.com> Date: Tue, 13 Oct 2020 18:11:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E8=AF=81=E9=87=91?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E4=B8=8E=E8=9E=8D=E8=B5=84=E6=AF=94=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lease/flow/project/commbusiness/PlatformDataToTemp.java | 4 +++- .../flow/project/commbusiness/PlatformDataToTempNotKjflc.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java index 9dfe2db26..33869bc63 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTemp.java @@ -289,6 +289,8 @@ public class PlatformDataToTemp extends BaseBussiness { cautionMoneyReferB = new BigDecimal(pccBo.getAttribute("CAUTION_MONEY").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(cautionMoneyRefer)) { cautionMoneyReferB = new BigDecimal(pccBo.getAttribute("CAUTION_MONEY").toString()).divide(totalAll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN); + }else if ("EquipEndAmt".equals(cautionMoneyRefer)){ + cautionMoneyReferB = new BigDecimal(lcctBo.getAttribute("CAUTION_MONEY").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); } /**手续费比例*/ @@ -402,7 +404,7 @@ public class PlatformDataToTemp extends BaseBussiness { lcctBo.setAttributeValue("ALL_FIRST_PAYMENT", pccBo.getAttribute("FIRST_PAYMENT").toString()); lcctBo.setAttributeValue("ALL_FIRST_PAYMENT_RATIO", new BigDecimal(pccBo.getAttribute("FIRST_PAYMENT").toString()).multiply(new BigDecimal("100")).divide(totalAll, 6, BigDecimal.ROUND_HALF_UP)); lcctBo.setAttributeValue("CLEAN_LEASE_MONEY", totalAll.subtract(new BigDecimal(pccBo.getAttribute("FIRST_PAYMENT").toString()))); - lcctBo.setAttributeValue("RENT_RATIO", totalAll.subtract(new BigDecimal(pccBo.getAttribute("FIRST_PAYMENT").toString())).divide(new BigDecimal(pccBo.getAttribute("EQUIP_AMT").toString()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN).toString()); + lcctBo.setAttributeValue("RENT_RATIO", totalAll.subtract(new BigDecimal(lcctBo.getAttribute("FIRST_PAYMENT").toString())).subtract(new BigDecimal(lcctBo.getAttribute("CAUTION_MONEY").toString())).divide(new BigDecimal(lcctBo.getAttribute("EQUIP_AMT").toString()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN).toString()); lcctBo.setAttributeValue("DISCOUNT", ""); lcctBo.setAttributeValue("PENA_RATE", PENA_RATE); lcctBm.saveObject(lcctBo); diff --git a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java index f723e8182..d752352e2 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java +++ b/src_tenwa/com/tenwa/lease/flow/project/commbusiness/PlatformDataToTempNotKjflc.java @@ -91,6 +91,8 @@ public class PlatformDataToTempNotKjflc extends BaseBussiness { cautionMoneyReferB = new BigDecimal(lcctBo.getAttribute("CAUTION_MONEY").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(cautionMoneyRefer)) { cautionMoneyReferB = new BigDecimal(lcctBo.getAttribute("CAUTION_MONEY").toString()).divide(totalAll, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN); + }else if ("EquipEndAmt".equals(cautionMoneyRefer)){ + cautionMoneyReferB = new BigDecimal(lcctBo.getAttribute("CAUTION_MONEY").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); } /**手续费比例*/ @@ -200,7 +202,7 @@ public class PlatformDataToTempNotKjflc extends BaseBussiness { lcctBo.setAttributeValue("ALL_FIRST_PAYMENT", lcctBo.getAttribute("FIRST_PAYMENT").toString()); lcctBo.setAttributeValue("ALL_FIRST_PAYMENT_RATIO", new BigDecimal(lcctBo.getAttribute("FIRST_PAYMENT").toString()).multiply(new BigDecimal("100")).divide(totalAll, 6, BigDecimal.ROUND_HALF_UP)); lcctBo.setAttributeValue("CLEAN_LEASE_MONEY", totalAll.subtract(new BigDecimal(lcctBo.getAttribute("FIRST_PAYMENT").toString()))); - lcctBo.setAttributeValue("RENT_RATIO", totalAll.subtract(new BigDecimal(lcctBo.getAttribute("FIRST_PAYMENT").toString())).divide(new BigDecimal(lcctBo.getAttribute("EQUIP_AMT").toString()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN).toString()); + lcctBo.setAttributeValue("RENT_RATIO", totalAll.subtract(new BigDecimal(lcctBo.getAttribute("FIRST_PAYMENT").toString())).subtract(new BigDecimal(lcctBo.getAttribute("CAUTION_MONEY").toString())).divide(new BigDecimal(lcctBo.getAttribute("EQUIP_AMT").toString()), 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN).toString()); lcctBo.setAttributeValue("DISCOUNT", ""); lcctBo.setAttributeValue("PENA_RATE", PENA_RATE); lcctBm.saveObject(lcctBo);