diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index d6c9b596..169b10e2 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -275,14 +275,14 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); // pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS, // pageList.get(i).getInAccountStatus())); diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index e42ed5ee..4aa5874f 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -349,9 +349,12 @@ and account_period = #{accountPeriod} - + and inaccount_status = #{inAccountStatus} + + and (inaccount_status = '0' or inaccount_status = '' or inaccount_status is null) + and bzdh = #{bzdh} @@ -446,9 +449,12 @@ and account_period = #{accountPeriod} - + and inaccount_status = #{inAccountStatus} + + and (inaccount_status = '0' or inaccount_status = '' or inaccount_status is null) + and bzdh = #{bzdh}