From d25b470d462adeba864be94d3adb8cc59e9dc8cd Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Wed, 25 Jul 2018 11:04:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B4=E6=81=AF?= =?UTF-8?q?=E9=A2=9D=E5=BA=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/projectapproval/BusinessApprovalStartAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java index fa66607d1..a1e3fb657 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/projectapproval/BusinessApprovalStartAction.java @@ -61,7 +61,8 @@ public class BusinessApprovalStartAction extends BaseFlowStartAction{ + " values (replace(uuid(),'-',''), '" + this.getProductId() + "', '" + flowBussiness.getAttribute("flow_unid").toString() + "', '" + uuid.replaceAll("-", "") + "'," + " " + discountValue + ", '" + this.CurUserID + "', '" + user.getOrgID() + "', replace(now(),'-','/'))")); } else { - throw new BusinessException("failed@产品贴息额已用完"); + this.setError_message("failed@产品贴息额已用完"); + throw new BusinessException("产品贴息额已用完"); } } } From bc742a6a09a50e80fe7feeca6b72d4065a985caf Mon Sep 17 00:00:00 2001 From: zhulianghua Date: Wed, 25 Jul 2018 11:07:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=BE=E6=AC=BE?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B0=BE=E6=AC=BE=E5=A4=84=E7=BD=AE=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E7=A7=9F=E9=87=91=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- calc/com/tenwa/reckon/bean/ConditionBean.java | 7 +++++++ calc/com/tenwa/reckon/help/RentalServiceImpl.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/calc/com/tenwa/reckon/bean/ConditionBean.java b/calc/com/tenwa/reckon/bean/ConditionBean.java index fd41bd09f..01dbe2f42 100644 --- a/calc/com/tenwa/reckon/bean/ConditionBean.java +++ b/calc/com/tenwa/reckon/bean/ConditionBean.java @@ -161,6 +161,7 @@ public class ConditionBean implements Cloneable{ private String corpusType; // 还本方式 private String corpus; // 期限内本金 private String finalPayment; //尾款 + private String finalPaymentMethod; //尾款处置方式 //**********************************************************************【众联车贷测算参与融资资金项结束！】 /*********************************************************************************** @@ -1709,4 +1710,10 @@ public class ConditionBean implements Cloneable{ public void setFinalPayment(String finalPayment) { this.finalPayment = finalPayment; } + public String getFinalPaymentMethod() { + return finalPaymentMethod; + } + public void setFinalPaymentMethod(String finalPaymentMethod) { + this.finalPaymentMethod = finalPaymentMethod; + } } diff --git a/calc/com/tenwa/reckon/help/RentalServiceImpl.java b/calc/com/tenwa/reckon/help/RentalServiceImpl.java index e2e4e7bff..168abe415 100644 --- a/calc/com/tenwa/reckon/help/RentalServiceImpl.java +++ b/calc/com/tenwa/reckon/help/RentalServiceImpl.java @@ -199,7 +199,7 @@ public class RentalServiceImpl { public List getNormalRentList(ConditionBean cb, List rent_list, String rent) { BigDecimal finalPayment = new BigDecimal(cb.getFinalPayment()); for (int i = 0; i < cb.getIncomeNumber(); i++) { - if(i == cb.getIncomeNumber() - 1 && finalPayment.compareTo(BigDecimal.ONE) != 0) { + if(i == cb.getIncomeNumber() - 1 && finalPayment.compareTo(BigDecimal.ONE) != 0 && "final_payment_method02".equals(cb.getFinalPaymentMethod())) { rent_list.add(finalPayment.add(new BigDecimal(rent)).toString()); } else { rent_list.add(rent);