Skip to content
Snippets Groups Projects

111111

Merged 崔用芳 requested to merge feature/cyf into dev
Compare and
1 file
+ 2
1
Compare changes
  • Side-by-side
  • Inline
@@ -37,9 +37,10 @@
left join (select distinct a.income_id,b.entry_type from t_entry_bill a left join
t_entry_bill_flow b on a.id=b.entry_id where b.entry_type in('到款转暂存')) i on i.income_id=a.id
left join t_bank_account_number j on j.bank_number=a.income_account and j.available='Yes'
and (f.entry_type='到账转收入' or f.entry_type='' or f.entry_type is null or f.entry_type='暂存转收入')
<where>
FIND_IN_SET(#{code}, b.finance_code)
and (f.entry_type='到账转收入' or f.entry_type='' or f.entry_type is null or f.entry_type='暂存转收入')
<if test="qry.voucherState.contains('已入账') ">
and (a.income_speed='入账' or a.income_speed='完成')
</if>