From 5fe5b2530ceb88d7f31c3d6a262f37950a16d235 Mon Sep 17 00:00:00 2001
From: zhangbb <zhangbb@DESKTOP-GH0CKE6>
Date: Thu, 23 May 2019 11:48:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=87=8D=E6=9E=84RentPlanIncomeList.JSP?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RentPlanIncomeList_new.jsp                | 36 +++++++++++++++++++
 .../LoanSimulation_formal/condition_plan.jsp  |  2 +-
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml       | 20 +++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp

diff --git a/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp b/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp
new file mode 100644
index 000000000..e97a51bcd
--- /dev/null
+++ b/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp
@@ -0,0 +1,36 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@page import="com.amarsoft.are.jbo.BizObject"%>
+<%@page import="com.amarsoft.are.jbo.JBOException"%>
+<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%	
+	/*
+        Author: undefined 2019-05-21
+        Content: 
+        History Log: 
+    */
+    String contract_id=CurPage.getParameter("id");
+	String plannumber = CurPage.getParameter("plannumber");
+	String sDONo = "VI_LC_RENT_INCOME";
+	BizObject status=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_STATUS","contract_id=:contract_id").setParameter("contract_id", contract_id).getSingleResult(false);
+	if(status==null){
+		sDONo="LC_PAY_RENT_PLAN";
+	} 
+	ASObjectModel doTemp = new ASObjectModel(sDONo);
+	if(plannumber!=null&&plannumber.length()>0&&!"null".equals(plannumber)){
+		doTemp.appendJboWhere(" and payment_number='"+plannumber+"'");
+	}
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--设置为Grid风格--
+	dwTemp.ReadOnly = "1";	 //只读模式
+	dwTemp.setPageSize(20);
+	dwTemp.genHTMLObjectWindow(contract_id);
+
+	//0、是否展示 1、	权限控制  2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码	6、	7、	8、	9、图标，CSS层叠样式 10、风格
+	String sButtons[][] = {
+
+	};
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+	
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Accounting/LoanSimulation_formal/condition_plan.jsp b/WebContent/Accounting/LoanSimulation_formal/condition_plan.jsp
index 5f9bf0c19..f6fedfeca 100644
--- a/WebContent/Accounting/LoanSimulation_formal/condition_plan.jsp
+++ b/WebContent/Accounting/LoanSimulation_formal/condition_plan.jsp
@@ -12,7 +12,7 @@
 	}
 	//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
 	String sTabStrip[][] = {
-		{falg, "租金计划", "/Accounting/LoanSimulation_formal/RentPlanIncomeList.jsp",params, "", "", "false"},
+		{falg, "租金计划(回笼)", "/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp",params, "", "", "false"},
 		{falg.equals("true")?"false":"true", "租金计划", "/Accounting/LoanSimulation_formal/RentPlanList.jsp",params, "", "", "false"},
 		{"true", "资金计划", "/Accounting/LoanSimulation_formal/FundPlanList.jsp",params, "", "", "false"},
 		{"true", "现金流", "/Accounting/LoanSimulation_formal/CashFlowList.jsp",params, "", "", "false"},
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 29dd2eb2c..9bd039cf1 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -3948,6 +3948,26 @@
 					<property name="createKey" value="true" />
 				</managerProperties>
 			</manager>
+		</class>
+		<class name="VI_LC_RENT_INCOME" label="绉熼噾璁″垝鍥炵" keyAttributes="">
+			<attributes>
+				<attribute name="CONTRACT_ID" label="鍚堝悓ID" type="STRING" length="32"/>
+				<attribute name="PAYMENT_NUMBER" label="鏀粯缂栧彿" type="STRING" length="32"/>
+				<attribute name="PLAN_LIST" label="鏈熸" type="STRING" length="32"/>
+				<attribute name="PLAN_DATE" label="璁″垝鏃ユ湡" type="STRING" length="50"/>
+				<attribute name="RENT" label="绉熼噾" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="CORPUS" label="鏈噾" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="INTEREST" label="鍒╂伅" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="RENT_OVERAGE" label="绉熼噾浣欓" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="CORPUS_OVERAGE" label="鏈噾浣欓" type="DOUBLE" length="22" scale="2"/>
+				<attribute name="INTEREST_OVERAGE" label="鍒╂伅浣欓" type="DOUBLE" length="22" scale="2"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="VI_LC_RENT_INCOME" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
 		</class>
 	</package>
 </jbo>