合同别融资租赁债权月报查询优化

src/main/webapp/WEB-INF/classes/cont/CON3600/contract_lease_report.lwm

@@ -3,6 +3,7 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
+                select * from(
                 SELECT
                     h.extra_nam,
                     --合同编号
@@ -408,6 +409,8 @@
                            (to_char(t.et_date, 'yyyy-mm') >= ${@period_name} and t.contract_status in ('TERMINATE',
                                                                                                        'ET')))
                       and trunc(t.lease_start_date) <= trunc(last_day(to_date(${@start_calc_date}, 'yyyy-mm-dd')))
+                ) t
+                #WHERE_CLAUSE#
                 ]]>
             </bm:query-sql>
         </bm:operation>
@@ -417,5 +420,8 @@
         <!--        <bm:query-field name="period_name" queryExpression="t1.period_day=${@period_name}"/>-->
         <!--        <bm:query-field name="journal_date_to" queryExpression="to_char(t.journal_date,&apos;yyyy-mm-dd&apos;) &lt;= ${@journal_date_to}"/>-->
         <!--        <bm:query-field name="bp_id_agent_level1" queryExpression="t.bp_id_agent_level1=${@bp_id_agent_level1}"/>-->
+                <bm:query-field name="contract_number" queryExpression="t.contract_number=${@contract_number}"/>
+                <bm:query-field name="rest_unpayment_amount_from" queryExpression="t.rest_unpayment_amount &gt;=${@rest_unpayment_amount_from}"/>
+                <bm:query-field name="rest_unpayment_amount_to" queryExpression="t.rest_unpayment_amount &lt;=${@rest_unpayment_amount_to}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/modules/cont/CON3600/contract_lease_report.lview

@@ -23,6 +23,9 @@
             var query_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             var grid_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
           var period_name=$(query_ds_id).getAt(0).get('period_name');
+          var contract_number = $(query_ds_id).getAt(0).get('contract_number');
+          var rest_unpayment_amount_from = $(query_ds_id).getAt(0).get('rest_unpayment_amount_from');
+          var rest_unpayment_amount_to  =$(query_ds_id).getAt(0).get('rest_unpayment_amount_to');
           if(!period_name){
               $L.showInfoMessage("提示",'请选择期间进行查询!');
               return;
@@ -38,6 +41,9 @@
             $(grid_ds_id).setQueryParameter('period_name',period_name);
             $(grid_ds_id).setQueryParameter('start_calc_date',start_calc_date);
             $(grid_ds_id).setQueryParameter('last_month_date',last_month_date);
+            $(grid_ds_id).setQueryParameter('contract_number',contract_number);
+            $(grid_ds_id).setQueryParameter('rest_unpayment_amount_from',rest_unpayment_amount_from);
+            $(grid_ds_id).setQueryParameter('rest_unpayment_amount_to',rest_unpayment_amount_to);
 
             $(grid_ds_id).query();
         }