From 7f93ba8a68917287210f40bf29a0e5a9ca893e03 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Mon, 15 Oct 2018 15:34:23 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=92=A4=E9=94=80=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=E3=80=82?=
 =?UTF-8?q?=202.=E5=9B=9E=E7=AC=BC=E7=BD=9A=E6=81=AF=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E4=B8=BA=E7=BD=9A=E6=81=AF=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E7=9A=84=E5=80=BC=EF=BC=8C=E4=B8=8D=E5=BA=94=E8=AF=A5=E4=B8=BA?=
 =?UTF-8?q?=E5=BA=94=E6=94=B6=E7=BD=9A=E6=81=AF=E7=9A=84=E5=80=BC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp | 4 ++--
 .../com/tenwa/flow/rent/rentincome/RentIncomeMethod.java      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
index edceb0937..c107b2996 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
@@ -47,6 +47,8 @@
 	}
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
+	var oldFactMoney = 0;
+	var newFactMoney = 0;
 	function updateEbankAndEbankProcessOfDel(){
 		var rows = getItemValueArray(0,"ID")+"";
 		if(rows == ""){
@@ -72,8 +74,6 @@
 			oldFactMoney = newFactMoney;
 			reloadSelf();
 		}
-		get();
-		total();
 	}
 	
 	function checkMayopeMoney(){
diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java
index d71920a75..c76852137 100644
--- a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java
+++ b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java
@@ -334,7 +334,7 @@ public class RentIncomeMethod {
 					if("penalty_income".equals(penaltyRule)){
 						penaltyOver = "0.00";
 					}else{
-						penaltyOver = JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME).createQuery("select v.getRentPenalty('"+boVLRP.getAttribute("PAYMENT_NUMBER").getString()+"','"+boVLRP.getAttribute("PLAN_LIST").getString()+"','"+factDate+"') v.penalty from O").getSingleResult(false).getAttribute("penalty").getString();
+					//	penaltyOver = JBOFactory.getBizObjectManager(VI_LC_RENT_PLAN.CLASS_NAME).createQuery("select v.getRentPenalty('"+boVLRP.getAttribute("PAYMENT_NUMBER").getString()+"','"+boVLRP.getAttribute("PLAN_LIST").getString()+"','"+factDate+"') v.penalty from O").getSingleResult(false).getAttribute("penalty").getString();
 					}
 					money = new BigDecimal(corpusOver).add(new BigDecimal(interestOver)).add(new BigDecimal(penaltyOver));
 					if(money.compareTo(bel) <= 0){