From 6597c6458184f9e54a5c03812556afd8b7d79ceb Mon Sep 17 00:00:00 2001
From: zzk <zhaozekun_java@163.com>
Date: Mon, 25 Apr 2022 17:31:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=89=8D=E7=BB=93=E6=B8=85=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LCContractTerminateInfo.jsp               | 11 +++++---
 .../CreateVoucherProcess/CarRatio.java        | 26 ++++++++++++++-----
 .../CreateVoucherProcess/EarlyContract.java   |  1 -
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
index e4b6b45e2..e882d2b5c 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
@@ -267,7 +267,8 @@
 	
 	//保存数据
 	function saveRecord(sPostEvents)
-	{
+	{    
+		debugger
 		//校验是否有保证金代偿
 		var isCompensation  = AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","isCompensation","contractId=<%=contractId%>");
 		if("false" == isCompensation){
@@ -321,7 +322,6 @@
 				}
 				//更新lc_ebank_temp中的值
 				var mage = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","updateEbank","flowunid=<%=flowunid%>,cleanLeasemoney="+contractTotal);
-				var returns = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","setEquipmentTerminateStatus","flowunid=<%=flowunid%>,IDS="+IDS);
 				if("Success"!=mage){
 					alert('提前结清失败！！！');
 					return;
@@ -472,6 +472,7 @@
 			      var PROPROTION_NUMBER = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","getReductionRatio","flowunid=<%=flowunid%>,IDS="+IDS);
 				  var NOMINAL_PRICE = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","getPrice","flowunid=<%=flowunid%>,IDS="+IDS);
 				  setItemValue(0,0,'PROPROTION_NUMBER',PROPROTION_NUMBER);
+				  var returns = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","setEquipmentTerminateStatus","flowunid=<%=flowunid%>,IDS="+IDS);
 				  var YES_NO = AsControl.RunJavaMethodTrans("com.tenwa.voucher.CreateVoucherProcess.EarlyContract","getYesNo","flowunid=<%=flowunid%>,IDS="+IDS);
 						// 留购价
 						setItemValue(0,0,'NOMINAL_PRICE',NOMINAL_PRICE);
@@ -530,8 +531,12 @@
 			// 逾期罚息				
 			setItemValue(0,getRow(),"DUN_PENALTY",DUN_PENALTY);
 			// 应退金额
+			var OTHEROUT = <%=cautionmoney%>;
+			if(OTHEROUT == "" || OTHEROUT == null){
+				OTHEROUT = "0.00"
+			}
 			if(YES_NO=='Y'){
-				setItemValue(0,getRow(),"OTHER_OUT",<%=cautionmoney%>);
+				setItemValue(0,getRow(),"OTHER_OUT",OTHEROUT);
 			}else{
 				setItemValue(0,getRow(),"OTHER_OUT","0.00");
 			}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CarRatio.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CarRatio.java
index 1aa3a0f34..a369f971e 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CarRatio.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CarRatio.java
@@ -8,16 +8,30 @@ import com.amarsoft.are.jbo.JBOTransaction;
 import com.amarsoft.awe.dw.handler.impl.CommonHandler;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 
-import jbo.app.LB_EQUIPMENT_CAR_TEMP;
-import jbo.loan.LOAN_INTEREST_PLAN;
 
 
 public class CarRatio extends CommonHandler {
+
+	String retainfield2;
+	
+	
+   
+	public String getRetainfield2() {
+		return retainfield2;
+	}
+
+
+
+	public void setRetainfield2(String retainfield2) {
+		this.retainfield2 = retainfield2;
+	}
+
+
 	protected void initDisplayForEdit(BizObject bo) throws Exception {
-		String sql="select concat(round(round(lect.EQUIP_PRICE / ifnull(t.num, 1), 4)* 100, 2),'%') as PROPROTION_NUMBER from lb_equipment_car_temp lect left join (select CONTRACT_ID,sum(ifnull(EQUIP_PRICE, 0)) as num from apzl.lb_equipment_car group by CONTRACT_ID ) t on t.CONTRACT_ID = lect.CONTRACT_ID where lect.FRAME_NUMBER = '"+bo.getAttribute("FRAME_NUMBER")+"' and lect.FLOWUNID = '"+bo.getAttribute("FlowUnid")+"'";
 		JBOTransaction tx=JBOFactory.createJBOTransaction();
-		List<Map<String,String>> list=DataOperatorUtil.getDataBySql(tx, sql, null);
-		String PROPROTION_NUMBER = list.get(0).get("PROPROTION_NUMBER");
-		bo.setAttributeValue("PROPROTION_NUMBER", PROPROTION_NUMBER);
+		int por = Integer.parseInt(bo.getAttribute("retainfield2").toString());
+	    por = por*100;
+		retainfield2 = String.valueOf(por)+"%";
+		bo.setAttributeValue("retainfield2", retainfield2);
 	}
 }
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java
index 1eafde37c..a40eea298 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/EarlyContract.java
@@ -429,7 +429,6 @@ public class EarlyContract {
 				}
 			}
 		}
-		// return returns;
 		return ""+returns+"";
 	}