From 4e128b311ce9e3cfab6a15708a9f9033b09fbd01 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Mon, 27 Aug 2018 21:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8F=90=E5=89=8D=E7=BB=93?=
 =?UTF-8?q?=E6=B8=85=E6=B5=81=E7=A8=8B=E6=98=BE=E7=A4=BA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Comm/LBContractEnd/rightsFileList.jsp     |   5 +-
 .../LCContractTerminateInfo.jsp               |  33 ++++++---
 .../LCContractTerminate/LCEbankTempList.jsp   |  24 ++++++-
 WebContent/fileTemplate/结清证明.docx         | Bin 0 -> 12565 bytes
 .../executor/CreateTransactionExecutor.java   |  64 ++++++++++++++++++
 .../tenwa/reckon/executor/RentCalHelper.java  |  10 ++-
 6 files changed, 120 insertions(+), 16 deletions(-)
 create mode 100644 WebContent/fileTemplate/结清证明.docx

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp
index d3cfe9546..c6909b89d 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContractEnd/rightsFileList.jsp
@@ -15,7 +15,7 @@
 
 	//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
 	String sButtons[][] = {
-		{"true","All","Button","���ɲ�Ȩ֤��","���ɲ�Ȩ֤��","saveRecord()","","","","btn_icon_save"},
+		{"true","All","Button","����֤��","����֤��","saveRecord()","","","","btn_icon_save"},
 	};
 	sButtonPosition = "north";
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
@@ -44,7 +44,8 @@
 		var tempParam={};
 		var sparam="";
 		var contract = getItemValue(0,getRow(0),"CONTRACT_ID");
-		param["templateNo"]="a9335f5624124b6db29f0d721fc8b61c";
+// 		param["templateNo"]="a9335f5624124b6db29f0d721fc8b61c";
+		param["templateNo"]="dc3a7c204da74515bc6d27771928a95d";
 		
 		//�����ļ�������ϵ
 		tempParam["OBJECTTYPE"]="rights";
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
index a5369073c..b9d346c05 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCContractTerminateInfo.jsp
@@ -25,6 +25,7 @@
 	doTemp.setDefaultValue("PAYMENT_NUMBER", paymentnumber);
 	doTemp.setHtmlEvent("PAYDAY_ADJUST","onchange","getTerminateInfo");
 	doTemp.setHtmlEvent("ADJUST_TYPE","onchange","changeInfo");
+	doTemp.setHtmlEvent("OTHER_IN","onchange","changeContract");
 	doTemp.setHtmlEvent("REPURCHASE_RATIO","onchange","getRepurchaseMoney");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
 	dwTemp.Style = "2";//freeform
@@ -55,6 +56,7 @@
 		var adjusttype = getItemValue(0,0,"ADJUST_TYPE");
 		if(adjusttype.length==0){
 			alert("����ѡ�������ͣ�����");
+			setItemValue(0,getRow(),"PAYDAY_ADJUST","");
 			return;
 		}
 		//���Լ����ֹ���Ƿ�Ϸ�
@@ -70,9 +72,10 @@
 			var overduerent =  terminateInfo.overduerent;
 			var remainfpenalty = terminateInfo.remainfpenalty;
 			var surplusinterest = terminateInfo.remaininterest;
+			var sumpenalty = terminateInfo.sumpenalty;
 			//������Ϣ��ʱ��ֵΪ0FIST_RENT
 // 			setItemValue(0,getRow(),"DUN_PENALTY","0");
-			setItemValue(0,getRow(),"DUN_PENALTY",remainfpenalty);
+			setItemValue(0,getRow(),"DUN_PENALTY",sumpenalty);
 			setItemValue(0,getRow(),"AGREED_PENALTY","0");
 			//�ѵ������
 			setItemValue(0,getRow(),"DUN_RENT",overduerent);
@@ -92,6 +95,7 @@
 			setItemValue(0,getRow(),"REPAYMENT_INTEREST","0");
 			setItemValue(0,getRow(),"SDNOMINAL_PRICE","0");
 			setItemValue(0,getRow(),"SDHANDLING_CHARGE","0");
+			setItemValue(0,getRow(),"OTHER_OUT","<%=cautionmoney%>");
 			
 			//�����ͬծȯ�ܼ�
 // 			setItemValue(0,getRow(),"CONTRACT_TOTAL",getContractBondTotal());
@@ -101,13 +105,15 @@
 					var fessMoneys = fessMoney.split("@");
 					setItemValue(0,getRow(),"COLLECT_FEES",fessMoneys[0]);
 					setItemValue(0,getRow(),"DISPOSE_MONEY",fessMoneys[1]);
-					setItemValue(0,getRow(),"SURPLUSINTEREST",surplusinterest);
-					setItemValue(0,getRow(),"GUARANTEEMONEY","<%=cautionmoney%>");
-					setItemValue(0,getRow(),"CONTRACT_TOTAL",parseFloat(getItemValue(0,getRow(),"DUN_RENT"))+parseFloat(fessMoneys[0])+parseFloat(remaincorpus));
+				}else{
+					setItemValue(0,getRow(),"COLLECT_FEES","0.00");
+					setItemValue(0,getRow(),"DISPOSE_MONEY","0.00");
 				}
+				setItemValue(0,getRow(),"SURPLUSINTEREST",surplusinterest);
+				setItemValue(0,getRow(),"GUARANTEEMONEY","<%=cautionmoney%>");
+				setItemValue(0,getRow(),"CONTRACT_TOTAL",parseFloat(getItemValue(0,getRow(),"DUN_RENT"))+parseFloat(getItemValue(0,getRow(),"COLLECT_FEES"))+parseFloat(remaincorpus));
 			}else{
-				setItemValue(0,getRow(),"OTHER_IN","200");
-				setItemValue(0,getRow(),"OTHER_OUT","<%=cautionmoney%>");
+				setItemValue(0,getRow(),"OTHER_IN","0.00");
 				setItemValue(0,getRow(),"CONTRACT_TOTAL",Number(overduerent)+Number(remainfpenalty)+Number(remaincorpus)+Number(terminateInfo.fist_rent)+Number(remaincorpus*0.05)+Number(getItemValue(0,getRow(),"OTHER_IN"))+Number(getItemValue(0,getRow(),"NOMINAL_PRICE"))-Number(getItemValue(0,getRow(),"OTHER_OUT")).toFixed(2));
 			}
 		}
@@ -200,7 +206,9 @@
 			//����Ӧ�պ�����Ӧ��
 			var result =  AsControl.RunJavaMethod("com.tenwa.reckon.executor.RentCalHelper","getTerminateOtherInfoFinish","contractId=<%=contractId%>,paymentnumber=<%=paymentnumber%>");
 			for(var p in result){
-				setItemValue(0,getRow(),p,result[p]);
+				if(result[p]!=null){
+					setItemValue(0,getRow(),p,result[p]);
+				}
 			}
 		}
 		changeInfo();
@@ -215,7 +223,7 @@
 			$("#A_div_2712").attr("style","display:block;");
 			$("#A_div_1061").attr("style","display:none;");
 			$("#A_div_1062").attr("style","display:none;");
-			$("#A_div_1301").attr("style","display:none;");
+			$("#A_div_1303").attr("style","display:none;");
 			$("#A_div_1302").attr("style","display:none;");
 			$("#A_div_1064").attr("style","display:none;");
 			$("#A_div_1065").attr("style","display:none;");
@@ -227,12 +235,19 @@
 			$("#A_div_2712").attr("style","display:none;");
 			$("#A_div_1061").attr("style","display:block;");
 			$("#A_div_1062").attr("style","display:block;");
-			$("#A_div_1301").attr("style","display:block;");
+			$("#A_div_1303").attr("style","display:block;");
 			$("#A_div_1302").attr("style","display:block;");
 			$("#A_div_1064").attr("style","display:block;");
 			$("#A_div_1065").attr("style","display:block;");
 			$("#A_div_2506").attr("style","display:block;");
 		}
+		var paydayadjust = getItemValue(0,0,"PAYDAY_ADJUST");
+		if(!(typeof(paydayadjust) == "undefined" || paydayadjust.length == 0)){
+			getTerminateInfo();
+		}
+	}
+	function changeContract(){
+		setItemValue(0,0,"CONTRACT_TOTAL",(Number(getItemValue(0,getRow(),"CONTRACT_TOTAL"))+Number(getItemValue(0,getRow(),"OTHER_IN"))).toFixed(2));
 	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp
index b78bb95c3..dea2d3f83 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LCContractTerminate/LCEbankTempList.jsp
@@ -6,6 +6,9 @@
         History Log: 
     */
     String flowunid = CurPage.getParameter("FlowUnid");
+	String flowName = CurPage.getParameter("FlowName");
+	String userID = CurUser.getUserID();
+	String orgID = CurUser.getOrgID();
 	ASObjectModel doTemp = new ASObjectModel("LCEbankTempList");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1";      	     //--����ΪGrid���--
@@ -17,7 +20,7 @@
 	String sButtons[][] = {
 		{"true","","Button","����","����","newRecord()","","","","btn_icon_add",""},
 		{"true","","Button","����","����","viewAndEdit()","","","","btn_icon_detail",""},
-		{"true","","Button","ɾ��","ɾ��","if(confirm('ȷʵҪɾ����?'))as_delete(0,'alert('ɾ���ɹ���')')","","","","btn_icon_delete",""},
+		{"true","","Button","ɾ��","ɾ��","do_delete()","","","","btn_icon_delete",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
@@ -34,7 +37,7 @@
 	    		alert("�˱������ѷ����տ����̣�");
 	    		return;
 	    	}
-	    	var message = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","copyLCEbankTemp","flowunid=<%=flowunid%>,contractId="+id);
+	    	var message = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","copyLCEbankTemp","flowunid=<%=flowunid%>,userID=<%=userID%>,orgID=<%=orgID%>,flow_name=<%=flowName%>,contractId="+id);
 	    	reloadSelf();
 		},"��ѡ���տ�����");
 	}
@@ -47,5 +50,22 @@
 		 }
 		AsControl.OpenView(sUrl,'FlowUnid=' +sPara ,'_self','');
 	}
+	function do_delete(){
+		var ebanknumber = getItemValue(0,getRow(0),"EBANK_SN");
+		if(typeof(ebanknumber) == "undefined" || ebanknumber.length == 0 ){
+			alert("��ѡ��һ����Ϣ��");
+			return ;
+		}
+		if(confirm('ȷʵҪɾ����?')){
+			debugger;
+			var message = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","deleteLCEbankTemp","flowunid=<%=flowunid%>,ebanknumber="+ebanknumber);
+			if("true"==message){
+				as_delete(0,'alert(ɾ���ɹ���)');
+			}else{
+				alert("ɾ��ʧ�ܣ�");
+			}
+			
+		}
+	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/fileTemplate/结清证明.docx b/WebContent/fileTemplate/结清证明.docx
new file mode 100644
index 0000000000000000000000000000000000000000..98ca42bf67e8e93987b5f386baa7c40c1c18048c
GIT binary patch
literal 12565
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
Rp+B8rVn2<JO`2!W{{d>eu=)T1

literal 0
HcmV?d00001

diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
index 906558d96..9b6e1e373 100644
--- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
+++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
@@ -20,12 +20,15 @@ import jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP;
 import jbo.app.tenwa.calc.LC_CALC_RULES_TEMP;
 import jbo.app.tenwa.calc.LC_CASH_FLOW;
 import jbo.app.tenwa.calc.LC_CASH_FLOW_TEMP;
+import jbo.app.tenwa.calc.LC_EBANK;
+import jbo.app.tenwa.calc.LC_EBANK_PROCESS;
 import jbo.app.tenwa.calc.LC_FUND_PLAN;
 import jbo.app.tenwa.calc.LC_FUND_PLAN_TEMP;
 import jbo.app.tenwa.calc.LC_FUND_RENT_ADJUST_TEMP;
 import jbo.app.tenwa.calc.LC_RENT_PLAN;
 import jbo.app.tenwa.calc.LC_RENT_PLAN_TEMP;
 import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
+import jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST;
 import jbo.com.tenwa.lease.comm.LC_PAY_CONDTION_TEMP;
 import jbo.sys.CODE_LIBRARY;
 
@@ -80,6 +83,10 @@ public class CreateTransactionExecutor implements Transaction {
     private String productId;
     private String planCName;
     private String startDate;
+	private String userID;
+	private String orgID;
+	private String flow_name;
+	private String ebanknumber;
     
     public String getStartDate() {
 		return startDate;
@@ -951,9 +958,34 @@ public class CreateTransactionExecutor implements Transaction {
 		// otherProperty.put("ID", id);
 		LeaseFlowBaseService service=new LeaseFlowBaseServiceImp();
 		service.copyEbankInfo(tx, fromCondtion, null,otherProperty, ServiceOperatorEnum.FormalToTemp);
+		//��������ʱ��
+		Map<String,String> fromCondtion1 = new HashMap<String, String>();
+		fromCondtion1.put("id",contractId);
+		fromCondtion1.put("userID",userID);
+		fromCondtion1.put("orgID",orgID);
+		Map<String,String> otherProperty1 = new HashMap<String,String>();
+		otherProperty1.put("FlowUnid", flowunid);
+		otherProperty1.put("flow_name", flow_name);
+		LeaseFlowBaseService service1=new LeaseFlowBaseServiceImp();
+		service1.copyEbankInfoToProcess(tx, fromCondtion1, null,otherProperty1, ServiceOperatorEnum.FormalToTemp);
+		
 		String sMessage="true"; 
 		return "";
 	}
+	/**
+	 * ɾ����Ӧ�������̱�
+	 * @param tx
+	 * @return
+	 * @throws Exception
+	 */
+	public String deleteLCEbankTemp(JBOTransaction tx) throws Exception {
+		BizObjectManager leManage = JBOFactory.getBizObjectManager(LC_EBANK.CLASS_NAME, tx);
+		BizObject le = leManage.createQuery("EBANK_SN=:EBANK_SN").setParameter("EBANK_SN", ebanknumber).getSingleResult(false);
+		BizObjectManager lepManage = JBOFactory.getBizObjectManager(LC_EBANK_PROCESS.CLASS_NAME, tx);
+		lepManage.createQuery("delete from O where flowunid=:flowunid and EBANK_NUMBER=:ebanknumber").setParameter("flowunid", flowunid).setParameter("ebanknumber", le.getAttribute("ID").getString()).executeUpdate();
+		return "true";
+	}
+	
 	public String getCalType() {
 		return calType;
 	}
@@ -1039,6 +1071,38 @@ public class CreateTransactionExecutor implements Transaction {
 		this.planCName = planCName;
 	}
 
+	public String getUserID() {
+		return userID;
+	}
+
+	public void setUserID(String userID) {
+		this.userID = userID;
+	}
+
+	public String getOrgID() {
+		return orgID;
+	}
+
+	public void setOrgID(String orgID) {
+		this.orgID = orgID;
+	}
+
+	public String getFlow_name() {
+		return flow_name;
+	}
+
+	public void setFlow_name(String flow_name) {
+		this.flow_name = flow_name;
+	}
+
+	public String getEbanknumber() {
+		return ebanknumber;
+	}
+
+	public void setEbanknumber(String ebanknumber) {
+		this.ebanknumber = ebanknumber;
+	}
+
 
 	
 }
diff --git a/calc/com/tenwa/reckon/executor/RentCalHelper.java b/calc/com/tenwa/reckon/executor/RentCalHelper.java
index f9a441eeb..79932dea1 100644
--- a/calc/com/tenwa/reckon/executor/RentCalHelper.java
+++ b/calc/com/tenwa/reckon/executor/RentCalHelper.java
@@ -157,10 +157,14 @@ public class RentCalHelper {
 			 + "sum(case when  DATE_FORMAT(t.plandate,'%Y/%m/%d') <  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')  then t.penalty else 0 end ) remainfpenalty,"
 			 +" sum(case when DATE_FORMAT( t.plandate,'%Y/%m/%d') >  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')   then t.interest else 0 end ) remainfininterest,"
 			 +" sum(case when  DATE_FORMAT( t.plandate,'%Y/%m/%d')  < DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')   then t.overduerent else 0 end ) overduerent,"
-			 		+ "sum(case when t.cou< t.planlist and t.planlist-t.cou<=12-t.cou then t.interest  else 0 end)"
-			 		+ "+sum(case when t.cou=t.planlist and t.planlist-t.cou<=12-t.cou then t.remainint else 0 end) fist_rent,"
+			 		+ "sum(case when t.cou< t.planlist and t.planlist-t.cou<=12-t.cou and DATE_FORMAT( t.plandate,'%Y/%m/%d') >  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.interest  else 0 end)"
+			 		+ "+sum(case when t.cou=t.planlist and t.planlist-t.cou<=12-t.cou and DATE_FORMAT( t.plandate,'%Y/%m/%d') >  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') then t.remainint else 0 end) fist_rent,"
 			 + " sum(case when t.cou< t.planlist and  t.planlist-t.cou>12-t.cou then t.corpus else 0 end)  fist_corpus,"
-			 + " max( case when DATE_FORMAT(t.plandate, '%Y/%m/%d') < DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')  then t.plandate else '0'  end) plandate"
+			 + " max( case when DATE_FORMAT(t.plandate, '%Y/%m/%d') < DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d')  then t.plandate else '0'  end) plandate,"
+			 		+ "sum(CASE WHEN DATE_FORMAT(t.plandate,'%Y/%m/%d') <  DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d') THEN "
+			 				+ " getRentPenalty('"+this.getPaymentnumber()+"',t.planlist,DATE_FORMAT('"+this.paydayAdjust+"','%Y/%m/%d'))"
+			 						+ " else 0 end"
+			 						+ ") sumpenalty  "
 			 + "  from ("
 	         + "       select "
 	         + "          t1.corpus-ifnull(t2.sumincomecorpus,0) remaincorpus,"