diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java index dce573e8..5188cf72 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsServiceImpl.java @@ -120,26 +120,26 @@ public class CustomsServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml index c3f6c37e..4398774c 100644 --- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml @@ -63,9 +63,12 @@ and t.account_period = #{accountPeriod} - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.bzdh = #{bzdh} @@ -141,9 +144,12 @@ and t.account_period = #{accountPeriod} - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.bzdh = #{bzdh}