diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 163b54be..3889c8c8 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -90,7 +90,7 @@ and t.rzh_yesorno = #{rzzt} - and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '3') + and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1') and t.xf_name like CONCAT(#{xfmc},'%') @@ -205,9 +205,12 @@ and t.qs_status = #{qszt} - + and t.rzh_yesorno = #{rzzt} + + and (t.rzh_yesorno = '2' OR t.rzh_yesorno = '1') + and t.xf_name like CONCAT(#{xfmc},'%') diff --git a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml index e0b7381a..f00a0a13 100644 --- a/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/index/ExtIndexStatisticsMapper.xml @@ -1672,7 +1672,7 @@ and invoice_status != '0' - and auth_status = '4' + and (rzh_yesorno = '1' or rzh_yesorno = '2') and invoice_type in ('01','03','08','14','31') and company = #{paramsData.company} and invoice_date between #{paramsData.kpksrq} and #{paramsData.kpjsrq}