diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 4e4ffd7a..2980ff5a 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -104,9 +104,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.qs_status = #{qszt} @@ -382,9 +385,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.qs_status = #{qszt} diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 750bc91d..3ceba96c 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -124,9 +124,12 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq} @@ -483,9 +486,12 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and (t.dept_id is null or t.dept_id='' or t.dept_id='99') diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index f0f0d302..7242a31b 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -342,8 +342,11 @@ and t.bzr like concat('%',#{bzr},'%') - - and t.in_account_status = #{inAccountStatus} + + and t.inaccount_status = #{inAccountStatus} + + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) and t.qs_status = #{qszt} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 05efa5e4..3915015b 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -68,9 +68,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.sn_voucher_number = #{snVoucherNumber} @@ -190,9 +193,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.sn_voucher_number = #{snVoucherNumber}