From 3d29aa81fcfc07f2a90216d561f49afbfea1f544 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 20 Jun 2023 17:58:30 +0800 Subject: [PATCH] =?UTF-8?q?arieay=20=E4=B8=80=E9=94=AE=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87=E6=9D=A1=E4=BB=B6=20&=20?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/BaseRzTDxRecordInvoiceController.java | 2 +- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java index 9b9682cc..ab9eda42 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java @@ -357,7 +357,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController { pramsMap.put("snVoucherNumber", map.get("snVoucherNumber")); pramsMap.put("postingTimeStart", map.get("postingTimeStart")); pramsMap.put("company", map.get("company")); - pramsMap.put("taxRate", map.get("taxRate")); + pramsMap.put("taxRate", taxRate); List gfshList = new ArrayList<>(); if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) { diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index c7ef4abd..6e4af301 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -77,7 +77,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.bdk_status in ('1','2') and t.export_mark = '0' - and t.auth_status != '0' + and t.auth_status in ('2','3','4') and t.company = #{company} and t.gf_tax_no in @@ -360,7 +360,7 @@ from t_dx_record_invoice t WHERE t.invoice_date 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.auth_status != '0' + and t.auth_status in ('2','3','4') and t.bdk_status in ('1','2') and t.export_mark = '0' and t.company =#{company}