From 3b0f06728fdfe86bb0c58fe4cec893442ccd8bc1 Mon Sep 17 00:00:00 2001
From: jianghongdong <jianghd@tenwa.com.cn>
Date: Fri, 28 Sep 2018 14:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80=E9=87=91=E9=A2=9D=E7=9A=84=E6=96=B9=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Rent/RentIncome/LCRentIncomeTempList.jsp  | 32 -------------------
 .../fund/fundcollection/FundIncomeMethod.java |  9 ++++++
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
index 220b2dc7c..edceb0937 100644
--- a/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Rent/RentIncome/LCRentIncomeTempList.jsp
@@ -47,36 +47,6 @@
 	}
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
-	var oldFactMoney = 0;
-	var newFactMoney = 0;
-	$(function(){
-		for(var i=0;i<DZ[0][2].length;i++){
-			oldFactMoney = eval(oldFactMoney + "+" + removeFomatedNumber(getItemValue(0,i,"CORPUS")));
-			oldFactMoney = eval(oldFactMoney + "+" + removeFomatedNumber(getItemValue(0,i,"INTEREST")));
-			oldFactMoney = eval(oldFactMoney + "+" + removeFomatedNumber(getItemValue(0,i,"PENALTY")));
-			var CerificationMoney = eval(removeFomatedNumber(getItemValue(0,i,"CORPUS"))+ "+" + removeFomatedNumber(getItemValue(0,i,"INTEREST"))+ "+" + removeFomatedNumber(getItemValue(0,i,"PENALTY"))+ "-" + removeFomatedNumber(getItemValue(0,i,"INTEREST_ADJUST")));
-			CerificationMoney = CerificationMoney.toFixed(2);
-			setItemValue(0,i,"CerificationMoney",CerificationMoney);
-		}
-		oldFactMoney = oldFactMoney.toFixed(2);
-		newFactMoney = oldFactMoney;
-		total();
-	})
-	function get(){
-		for(var i=0;i<DZ[0][2].length;i++){
-			var CerificationMoney = eval(removeFomatedNumber(getItemValue(0,i,"CORPUS"))+ "+" + removeFomatedNumber(getItemValue(0,i,"INTEREST"))+ "+" + removeFomatedNumber(getItemValue(0,i,"PENALTY"))+ "-" + removeFomatedNumber(getItemValue(0,i,"INTEREST_ADJUST")));
-			CerificationMoney = CerificationMoney.toFixed(2);
-			setItemValue(0,i,"CerificationMoney",CerificationMoney);
-		}
-	}
-	function total(){
-		var total=0;
-		for(var i=0;i<DZ[0][2].length;i++){
-			total= eval(total + "+" + removeFomatedNumber(getItemValue(0,i,"CerificationMoney")));
-		}
-		total = total.toFixed(2);
-		$('#myiframe0_order_GridBody_Cells').children('.list_smallcount_color').find('td').eq(4).children('div').text(total);
-	}
 	function updateEbankAndEbankProcessOfDel(){
 		var rows = getItemValueArray(0,"ID")+"";
 		if(rows == ""){
@@ -245,8 +215,6 @@
 			setItemValue(0,position,"rent",oldRent);
 			newFactMoney = newFactMoney - beyondBalance;
 		}
-		get();
-		total();
 	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
index 5f77e3f6d..b6137b558 100644
--- a/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
+++ b/src_tenwa/com/tenwa/flow/fund/fundcollection/FundIncomeMethod.java
@@ -423,4 +423,13 @@ public class FundIncomeMethod {
 		}
 		return "SUCCESS";
 	}
+	
+	public static String setCerificationMoney(String corpus,String interest,String penalty){
+		BigDecimal c = new BigDecimal(corpus);
+		BigDecimal i = new BigDecimal(interest);
+		BigDecimal p = new BigDecimal(penalty);
+		c=c.add(i).add(p);
+//		double  CerificationMoney= Double.valueOf(corpus)+Double.valueOf(interest)+Double.valueOf(penalty);
+		return c.doubleValue()+"";
+	}
 }