Merge branch 'feature/optimization' into develop

src/main/webapp/WEB-INF/classes/hls_acr/hls_acr5010/run_ebank_output.lwm

@@ -10,7 +10,7 @@
 				       p_session_id =>${/session/@session_id},
 				       p_file_name => ${/parameter/@file_name},
 				       p_deadline_date =>to_date(${@deadline_date},'yyyy-mm-dd'),
-				        p_deadline_date_to =>to_date(${@deadline_date_to},'yyyy-mm-dd'),
+				       p_deadline_date_to =>to_date(${@deadline_date_to},'yyyy-mm-dd'),
 				       p_currency_code =>${@currency_code},
 				       p_customer_type =>${@customer_type},
 				       p_payment_type =>${@payment_method},
@@ -21,7 +21,8 @@
 				       p_contract_number => ${@contract_number},
 				       p_period_split_flag	=>	${@generate_rules},
 				       p_output_id=>${@output_id},
-				       p_times=>${@period_number});
+				       p_times=>${@period_number},
+					   p_penalty_date_to=>to_date(${@penalty_date_to},'yyyy-mm-dd'));
 				END;		
 			]]></bm:update-sql>
             <bm:parameters>

src/main/webapp/modules/hls_acr/HLS_ACR5010/hls_acr_ebank_output.lview

@@ -227,6 +227,7 @@
                     <!--                    <a:field name="deadline_date" required="true"/>-->
                     <!--                    <a:field name="deadline_date_to" required="true"/>-->
                     <a:field name="deadline_date_to" required="true" defaultValue="${/model/sys_date_rp/record/@now_time}"/>
+                    <a:field name="penalty_date_to"/>
                     <a:field name="currency_code" defaultValue="CNY"/>
                     <a:field name="currency_name" readOnly="true" defaultValue="人民币" displayField="currency_name"
                              options="hls_currency_ds" required="true" returnField="currency_code"
@@ -266,6 +267,7 @@
             <a:form column="2" labelWidth="120" title="代扣指令生成" width="600">
                 <!--                <a:datePicker name="deadline_date" bindTarget="hls_acr_ebank_output_ds" prompt="截至日期从" renderer="Leaf.formatDate"/>-->
                                 <a:datePicker name="deadline_date_to" bindTarget="hls_acr_ebank_output_ds" prompt="截至日期到" renderer="Leaf.formatDate"/>
+                                <a:datePicker name="penalty_date_to" bindTarget="hls_acr_ebank_output_ds" prompt="指定罚息截止日" renderer="Leaf.formatDate"/>
                 <a:comboBox name="currency_name" bindTarget="hls_acr_ebank_output_ds" prompt="币种"/>
                 <a:comboBox name="customer_type_display" bindTarget="hls_acr_ebank_output_ds" prompt="客户类型"/>
                 <a:lov name="customer_name_display" bindTarget="hls_acr_ebank_output_ds" prompt="客户名称"/>