diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml index 0c168334..5e95597c 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml +++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml @@ -1097,10 +1097,14 @@ and p.gf_tax_no = #{queryParams.gfsh} - + and p.rzh_yesorno = #{queryParams.rzhYesorno} + + and (p.rzh_yesorno = '1' or p.rzh_yesorno = '2') + + and p.bdk_status = #{queryParams.rzlx} diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index b53126ca..ef198ca1 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -82,9 +82,12 @@ and t.qs_status = #{qszt} - + and t.rzh_yesorno = #{rzzt} + + and (t.rzh_yesorno = '1' or t.rzh_yesorno = '2') + and t.rzlx = #{rzlx} @@ -221,9 +224,12 @@ and t.qs_status = #{qszt} - + and t.rzh_yesorno = #{rzzt} + + and (t.rzh_yesorno = '1' or t.rzt_yesorno = '2' ) + and t.rzlx = #{rzlx}