diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index f0ad784f..324d8afd 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -14,6 +14,7 @@ import java.util.Map; import javax.annotation.Resource; import com.dxhy.common.constant.DictConstant; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import com.alibaba.fastjson.JSONObject; @@ -49,6 +50,7 @@ import com.github.pagehelper.PageInfo; * @version 1.0 */ @SuppressWarnings({"AlibabaLowerCamelCaseVariableNaming", "AlibabaUndefineMagicConstant", "AlibabaMethodTooLong"}) +@Slf4j @Service("baseInvoiceManualCheckService") public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl implements BaseInvoiceManualCheckService { @@ -204,10 +206,12 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl - and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') ) + and t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') and t.invoice_type = #{invoiceType} @@ -257,7 +257,7 @@ and t.payment_status = #{paymentStatus} - and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') ) + and t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') and t.invoice_type = #{invoiceType} @@ -355,7 +355,7 @@ from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.rzh_yesorno = '0' and t.auth_status in('0','5','6') and t.export_mark = '0' @@ -392,7 +392,7 @@ and t.voucher_number like concat('%',concat(#{voucherNumber},'%')) - and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') ) + and t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') and t.invoice_type = #{invoiceType} @@ -463,7 +463,7 @@ from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq WHERE to_char(t.invoice_date,'yyyy-mm-dd') between #{kpksrq} and #{kpjsrq} - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.rzh_yesorno = '0' and t.auth_status in('0','5','6') and t.export_mark = '0' @@ -479,10 +479,10 @@ - and (t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount <0 or t.tax_amount <0 or + and t.invoice_status in ('1','2','3','4','8','80') or t.invoice_amount <0 or t.tax_amount <0 or to_char(t.invoice_date,'yyyymmdd') <= c.select_start_date or to_char(t.invoice_date,'yyyymmdd') >= - c.select_end_date or d.tj_status in ('1','2')) + c.select_end_date or d.tj_status in ('1','2') and t.gf_tax_no in @@ -500,7 +500,7 @@ and t.voucher_number like concat('%',concat(#{voucherNumber},'%')) - and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') ) + and t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') and t.invoice_type = #{invoiceType} @@ -755,7 +755,7 @@ where date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} and t.rzh_yesorno = '0' and t.invoice_status in ('0','7') - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.export_mark = '0' and t.invoice_amount>0 and t.tax_amount>=0 @@ -789,7 +789,7 @@ and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq} - and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') ) + and t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') and t.invoice_type = #{invoiceType} @@ -834,7 +834,7 @@ where to_char(t.invoice_date,'yyyy-MM-dd') between #{kpksrq} and #{kpjsrq} and t.rzh_yesorno = '0' and t.invoice_status in ('0','7') - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.invoice_amount>0 and t.tax_amount>=0 and t.auth_status in ('0','5','6') @@ -867,7 +867,7 @@ and to_char(t.qs_date,'yyyy-MM-dd') between #{qsksrq} and #{qsjsrq} - and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') ) + and t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') and t.invoice_type = #{invoiceType} @@ -925,7 +925,7 @@ from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.rzh_yesorno = '0' and t.invoice_status in ('0','7') and t.auth_status in('0','5','6') @@ -1012,7 +1012,7 @@ from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq WHERE to_char(t.invoice_date,'yyyy-MM-dd') between #{kpksrq} and #{kpjsrq} - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.rzh_yesorno = '0' and t.invoice_status in ('0','7') and t.auth_status in('0','5','6') @@ -1094,7 +1094,7 @@ from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.rzh_yesorno = '0' and t.invoice_status in ('0','7') and t.auth_status in('0','5','6') @@ -1169,7 +1169,7 @@ from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq WHERE to_char(t.invoice_date,'yyyy-MM-dd') between #{kpksrq} and #{kpjsrq} - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.rzh_yesorno = '0' and t.invoice_status in ('0','7') and t.auth_status in('0','5','6')