From da3ca890e5f95aa3c2f4abe46ab7b7c0f46e1e6b Mon Sep 17 00:00:00 2001
From: tangfutang <3218982385@qq.com>
Date: Sun, 30 Jul 2023 16:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BB=B6=E6=9C=9F=E6=9C=9F?=
 =?UTF-8?q?=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanSimulation_dormant/LCRentDormantInfo.jsp |  5 ++---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml          |  1 +
 .../executor/CreateTransactionExecutor.java      |  1 +
 .../tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java  | 16 ++++++++++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp
index 57a76e03d..4d43bbec0 100644
--- a/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp
+++ b/WebContent/Accounting/LoanSimulation_dormant/LCRentDormantInfo.jsp
@@ -219,9 +219,8 @@ function cancelChange(){
 	}, 500);
 }
 
-function run()
-{
-	var result = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","runRentdormant","flowunid=<%=flowunid%>,plannumber=<%=paymentNumber%>,productId=<%=ProductId%>,calType=pay_process");
+function run(){
+	var result = AsControl.RunJavaMethodTrans("com.tenwa.reckon.executor.CreateTransactionExecutor","runRentdormant","flowunid=<%=flowunid%>,plannumber=<%=paymentNumber%>,productId=<%=ProductId%>,calType=pay_process,expandList="+getItemValue(0,getRow(),"EXPAND_LIST"));
 	if (result.result === 'false') {
 		alert('²âËãʧ°Ü: ' + result.msg);
 	}
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 8cd1cdf8f..cb96a51e5 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -4709,6 +4709,7 @@
 				<attribute name="CHANGE_TYPE" label="�更类型" type="STRING" length="32"/>
 				<attribute name="DELAY_START_LIST" label="延期开始期次" type="STRING" length="20"/>
 				<attribute name="DELAY_END_LIST" label="延期�总期数" type="STRING" length="20" />
+				<attribute name="EXPAND_LIST" label="展期期次" type="STRING" length="32" />
 			</attributes>
 			<manager>
 				<managerProperties>
diff --git a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
index fab6f0c00..367c7893f 100644
--- a/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
+++ b/calc/com/tenwa/reckon/executor/CreateTransactionExecutor.java
@@ -61,6 +61,7 @@ public class CreateTransactionExecutor implements Transaction {
     private String distributorId;
     private String equipAmt;
     private String subsectionConfig;
+    private String expandList;
 
     public String getEquipAmt() {
         return equipAmt;
diff --git a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java
index 0e5a02c7c..a1236710e 100644
--- a/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java
+++ b/src_jbo/jbo/app/tenwa/calc/LC_DORMANT_RENT_ADJUST_TEMP.java
@@ -73,4 +73,20 @@ public interface LC_DORMANT_RENT_ADJUST_TEMP{
 	* ÐÝÃß±ä¸üÇ°IRR DOUBLE(22)<br>
 	*/
 	public static final String IRR_OLD = "IRR_OLD";
+	/**
+	* ±ä¸üÀàÐÍ STRING(32)<br>
+	*/
+	public static final String CHANGE_TYPE = "CHANGE_TYPE";
+	/**
+	* ÑÓÆÚ¿ªÊ¼ÆÚ´Î STRING(20)<br>
+	*/
+	public static final String DELAY_START_LIST = "DELAY_START_LIST";
+	/**
+	* ÑÓÆÚºó×ÜÆÚÊý STRING(20)<br>
+	*/
+	public static final String DELAY_END_LIST = "DELAY_END_LIST";
+	/**
+	* Õ¹ÆÚÆÚ´Î STRING(32)<br>
+	*/
+	public static final String EXPAND_LIST = "EXPAND_LIST";
 }
\ No newline at end of file