[refactor] 划扣\核销 查询调整

src/main/webapp/WEB-INF/classes/ccb/CCB600/con_contract_cashflow_query.lwm

@@ -37,7 +37,7 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="query"
-                        expression="c.contract_id = ccc.contract_id and ccc.due_date &lt;= trunc(sysdate) and  c.data_class = 'NORMAL' and ccc.write_off_flag != 'FULL' and c.contract_status in ('SIGN','INCEPT') and ccc.cf_status = 'RELEASE' and ccc.cf_direction = 'INFLOW' and c.pay_method is not null"/>
+                        expression="c.contract_id = ccc.contract_id and ccc.due_date &lt;= trunc(sysdate) and  c.data_class = 'NORMAL' and ccc.write_off_flag != 'FULL' and c.contract_status in ('SIGN','INCEPT') and ccc.cf_status = 'RELEASE' and ccc.cf_direction = 'INFLOW' and c.pay_method is not null and ccc.cf_item in (1,9)"/>
         <bm:data-filter name="query"
                         expression="not exists(select 1 from hls_ebank_batch_group g,hls_ebank_batch_ln l where g.status in ('NEW','DEAL') and g.group_id = l.group_id and l.cashflow_id = ccc.cashflow_id)"/>
     </bm:data-filters>

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off.lwm

@@ -96,7 +96,7 @@
                        t1.WRITE_OFF_DUE_AMOUNT write_off_amount,
                        t1.WRITE_OFF_PRINCIPAL,
                        t1.WRITE_OFF_INTEREST,
-                       (select bp_name from hls_bp_master where bp_id = t1.bp_id) bp_tenant_name
+                       (select bp_name from hls_bp_master h,con_contract c where h.bp_id = c.bp_id_tenant and c.contract_id = t1.contract_id) bp_tenant_name
                        from csh_write_off t1) t
                        #WHERE_CLAUSE#
             ]]></bm:query-sql>

src/main/webapp/WEB-INF/classes/csh/CSH531N/csh_write_off_interface.lwm

@@ -113,7 +113,7 @@ end;
         <bm:field name="agent_id_desc" expression="(select hbm.bp_name from hls_bp_master hbm where hbm.bp_id = t1.agent_id)" forUpdate="false" forInsert="false"/>
         <bm:field name="write_off_classification" lookupField="write_off_classification_desc" lookupCode="DS_CSH_WRITE_OFF_CLASSIFICATION" databaseType="VARCHAR2" datatype="java.lang.String" />
         <bm:field name="write_off_classification_desc" forInsert="false" forUpdate="false"/>
-        <bm:field name="bp_tenant_name" expression="(select bp_name from hls_bp_master where bp_id = t1.write_off_bp_id)" forInsert="false" forUpdate="false"/>
+        <bm:field name="bp_tenant_name" expression="(select bp_name from hls_bp_master h,con_contract c where h.bp_id = c.bp_id_tenant and c.contract_id = t1.contract_id)" forInsert="false" forUpdate="false"/>
         <bm:field name="journal_date" databaseType="DATE" datatype="java.util.Date"/>
     </bm:fields>
     <bm:features>