diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml index 06e7b599..fdfa6ec0 100644 --- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml +++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml @@ -387,8 +387,30 @@ and t.list_status = #{listMark} - - and t.payment_status = #{inAccountStatus} + + and t.inaccount_status = #{inAccountStatus} + + + and (t.inaccount_status = '' or t.inaccount_status is null or t.inaccount_status = '0') + + + and t.sn_voucher_number = #{snVoucherNumber} + + + + and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} + + + + and t.bzdh = #{bzdh} + + + + and t.account_period = #{accountPeriod} + + + + and t.image_id = #{imageNumber} and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}