I-22569【建机】提前还款客户收入确认逻辑优化

src/main/webapp/WEB-INF/classes/hls/HLS801/con_finance_income.lwm

@@ -42,7 +42,7 @@
         <bm:operation name="update">
             <bm:update-sql><![CDATA[
                 BEGIN
-                hls_monthend_new_pkg.finance_income_je_job(
+                hls_monthend_new_pkg.advance_finance_income(
                 p_date 		=> to_date(${@calc_end_date},'YYYY-MM-DD'),
                 p_company_id	=> ${/session/@company_id},
                 p_user_id 	=> ${/session/@user_id});

src/main/webapp/WEB-INF/classes/hls/HLS801/con_unearned_finance_income.lwm

@@ -59,8 +59,8 @@
         <bm:query-field  field="finance_income_recognized" queryExpression="t1.finance_income_recognized=${@finance_income_recognized}"/>
     </bm:query-fields>
     <bm:data-filters>
-        <bm:data-filter enforceOperations="query" expression="t1.internal_period_num = ${@internal_period_num} and exists (Select 1 From con_contract cc Where t1.contract_id = cc.contract_id And cc.data_class = &apos;NORMAL&apos; And t1.cf_item In (1, 8) And ((t1.cf_item = 1 And cc.contract_status In (&apos;TERMINATE&apos;, &apos;INCEPT&apos;, &apos;ETING&apos;, &apos;REPURING&apos;)) Or (t1.cf_item = 8 And cc.contract_status In (&apos;TERMINATE&apos;, &apos;INCEPT&apos;))) ) and exists (select 1 from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id and c.interest is not null)"/>
-        <bm:data-filter enforceOperations="query" expression="to_char(t1.calc_end_date,&apos;yyyy-mm-dd&apos;) = ${@calc_end_date} "/>
+        <bm:data-filter enforceOperations="query" expression="(t1.internal_period_num = ${@internal_period_num} or (t1.internal_period_num > ${@internal_period_num} and exists(select 1 from con_contract_cashflow ccc where ccc.cashflow_id = t1.cashflow_id and ccc.write_off_flag = 'FULL' and to_char(ccc.full_write_off_date, 'yyyy-mm') = to_char(to_date(${@calc_end_date},'yyyy-mm-dd'),'yyyy-mm') and trunc(ccc.due_date) > trunc(to_date(${@calc_end_date},&apos;yyyy-mm-dd&apos;))))) and exists (Select 1 From con_contract cc Where t1.contract_id = cc.contract_id And cc.data_class = &apos;NORMAL&apos; And t1.cf_item In (1, 8) And ((t1.cf_item = 1 And cc.contract_status In (&apos;TERMINATE&apos;, &apos;INCEPT&apos;, &apos;ETING&apos;, &apos;REPURING&apos;)) Or (t1.cf_item = 8 And cc.contract_status In (&apos;TERMINATE&apos;, &apos;INCEPT&apos;))) ) and exists (select 1 from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id and c.interest is not null)"/>
+        <bm:data-filter enforceOperations="query" expression="(to_char(t1.calc_end_date,&apos;yyyy-mm-dd&apos;) = ${@calc_end_date} or (to_char(t1.calc_end_date,&apos;yyyy-mm-dd&apos;) > ${@calc_end_date} and exists (select 1 from con_contract_cashflow ccc where ccc.cashflow_id = t1.cashflow_id and ccc.write_off_flag = 'FULL' and to_char(ccc.full_write_off_date, 'yyyy-mm') = to_char(to_date(${@calc_end_date},'yyyy-mm-dd'),'yyyy-mm') and trunc(ccc.due_date) > trunc(to_date(${@calc_end_date},&apos;yyyy-mm-dd&apos;)))))"/>
         <bm:data-filter enforceOperations="query" expression="t1.cashflow_id in (select cw.cashflow_id from con_contract_cashflow cw where cw.cf_direction not in ('NONCASH'))"/>
 <!--        <bm:data-filter enforceOperations="query" expression="t1.contract_id in (select contract_id from con_contract t where nvl(t.fraud_flag,'N') !='Y')"/>-->
     </bm:data-filters>