Skip to content
Snippets Groups Projects

111111

Merged 崔用芳 requested to merge feature/cyf into dev
Compare and
1 file
+ 4
6
Compare changes
  • Side-by-side
  • Inline
@@ -296,7 +296,7 @@
a.available='Yes' and a.is_offline=0
and g.income_id is null
and a.supplement_state!='已补充'
<if test="qry.voucherStateSelect !=null and qry.voucherStateSelect!='' ">
@@ -310,17 +310,15 @@
and a.income_account=#{qry.incomeAccount}
</if>
<if test="qry.voucherState !=null and qry.voucherState.contains('全部') ">
and ( (( a.income_speed = '业务补充' or a.income_speed = '发布' or a.income_speed = '待认领' or a.need_in_quire=1 )
and ( (( a.income_speed = '业务补充' or a.income_speed = '发布' or a.income_speed = '待认领' or a.income_speed = '入账' or a.need_in_quire=1 )
and (h.voucher_state='申请中' or h.voucher_state='驳回' or h.voucher_state='已入账' or h.voucher_state is null or h.voucher_state='' ))
or (a.income_speed = '入账' and ( a.supplement_state='' or a.supplement_state is null or supplement_state='待补充')
)
</if>
<if test="qry.voucherState !=null and qry.voucherState.contains('待处理')">
and ( (( a.income_speed = '业务补充' or a.income_speed = '发布'
and ( (( a.income_speed = '业务补充' or a.income_speed = '发布' or a.income_speed = '入账'
or a.income_speed = '待认领'
or a.need_in_quire=1 ) or (a.income_speed = '入账' and ( a.supplement_state='' or a.supplement_state is null or supplement_state='待补充'))
or a.need_in_quire=1 )
and (h.voucher_state='' or h.voucher_state='驳回' or h.voucher_state is null ))
)
</if>