diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java index f92b3a04..83ca3659 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java @@ -513,6 +513,14 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl and t.gf_tax_no = #{gfsh} - and t.comp_code = #{companyCode} + and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) and t.rzh_belong_date = #{skssq} diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml index a1993371..72bfed55 100644 --- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml +++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml @@ -58,7 +58,7 @@ and t.bzdh = #{bzdh} - and t.inaccount_status = #{inAccountStatus} + and (t.inaccount_status != '1' or t.inaccount_status is null) and t.customs_code = #{customsCode} diff --git a/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml index bbccafa4..609f23b8 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtRzjgqdMapper.xml @@ -47,7 +47,10 @@ and t.auth_status = '4' and t.company = #{company} and t.gf_tax_no = #{gfsh} - and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null) + and t.comp_code = #{companyCode} + + and t.rzh_belong_date = #{skssq} +