From 905979ca114182e489f6331715f3d309fa7d6939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 18 Jan 2024 11:10:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=92=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=E6=9C=AA=E8=AE=A4=E8=AF=81=E5=92=8C?= =?UTF-8?q?=E6=92=A4=E9=94=80=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 8 ++++++-- dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 194e2588..4232ae31 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -75,12 +75,14 @@ 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') - and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status in ('0','2','3','4','5','6') and t.company = #{company} and t.gf_tax_no = #{gfsh} and t.comp_code = #{companyCode} + + and t.bdk_status in ('1','2') + and t.invoice_status = #{invoiceStatus} @@ -361,9 +363,11 @@ and t.comp_code = #{companyCode} and t.invoice_type in('01','03','08','14','31','283','161','183','185') and t.auth_status in ('0','2','3','4','5','6') - and t.bdk_status in ('1','2') and t.export_mark = '0' and t.company =#{company} + + and t.bdk_status in ('1','2') + and t.invoice_status = #{invoiceStatus} diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 5096e391..be2b498c 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -106,13 +106,15 @@ 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') - and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status in ('0','2','3','4','5','6') and t.company = #{company} and t.gf_tax_no = #{gfsh} and t.comp_code = #{companyCode} + + and t.bdk_status in ('1','2') + and t.invoice_status = #{invoiceStatus} From 33e2ae63129f7defbaceec3755418aa0071fd3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 18 Jan 2024 13:44:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=92=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96=E6=9C=AA=E8=AE=A4=E8=AF=81=E5=92=8C?= =?UTF-8?q?=E6=92=A4=E9=94=80=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/BaseFpZhMapper.xml | 17 +++++++++++++++++ .../main/resources/mapper/BaseSggxcxMapper.xml | 3 +++ .../src/main/resources/mapper/FpZhMapper.xml | 7 +++++++ 3 files changed, 27 insertions(+) diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 4232ae31..a9cd0dd4 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -83,6 +83,13 @@ and t.bdk_status in ('1','2') + + AND t.inaccount_status = '1' + AND t.rzh_yesorno = '0' + + and t.bzdh is not null + + and t.invoice_status = #{invoiceStatus} @@ -368,6 +375,16 @@ and t.bdk_status in ('1','2') + + + AND t.inaccount_status = '1' + AND t.rzh_yesorno = '0' + + and t.bzdh is not null + + + + and t.invoice_status = #{invoiceStatus} diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index e3f0b072..5c50827a 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -523,6 +523,9 @@ and t.bzdh = #{bzdh} + + and t.bzdh is not null + and t.inaccount_status = #{inAccountStatus} diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index be2b498c..3cdd444b 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -115,6 +115,13 @@ and t.bdk_status in ('1','2') + + AND t.inaccount_status = '1' + AND t.rzh_yesorno = '0' + + and t.bzdh is not null + + and t.invoice_status = #{invoiceStatus} From b0f9f8adf0a1364fc943d8be91a02581bb37bdfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 24 Jan 2024 16:28:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E8=A7=A3=E5=86=B3=E6=95=B4=E5=90=88=E6=89=8B=E5=B7=A5?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=9A=84=E9=80=BB=E8=BE=91=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseInvoiceController.java | 2 +- .../main/resources/mapper/BaseFpZhMapper.xml | 25 ++++++++++++++----- .../dxhy/core/thread/RzFpxxExportThread.java | 2 +- .../src/main/resources/mapper/FpZhMapper.xml | 18 ++++++++++--- 4 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index e12468a3..33296232 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -313,7 +313,7 @@ public class BaseInvoiceController extends AbstractController { if (!"99".equals(rzclzt)) { pramsMap.put("rzclzt", rzclzt); } else { - pramsMap.put("rzclzt", ""); + pramsMap.put("rzclzt", "99"); } } else { return ResponseEntity.ok(R.error("认证状态不能为空！")); diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index a9cd0dd4..559abec3 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -80,16 +80,24 @@ and t.company = #{company} and t.gf_tax_no = #{gfsh} and t.comp_code = #{companyCode} - + and t.bdk_status in ('1','2') - + AND t.inaccount_status = '1' AND t.rzh_yesorno = '0' and t.bzdh is not null + + + AND ( + (t.auth_status = '4' and t.bdk_status IN ( '1', '2' )) + or (t.auth_status in ('0','6') AND t.inaccount_status = '1' AND t.rzh_yesorno = '0' and t.bzdh is not null) + or t.auth_status in ('2','3','5') + ) + and t.invoice_status = #{invoiceStatus} @@ -372,11 +380,10 @@ and t.auth_status in ('0','2','3','4','5','6') and t.export_mark = '0' and t.company =#{company} - + and t.bdk_status in ('1','2') - - + AND t.inaccount_status = '1' AND t.rzh_yesorno = '0' @@ -384,7 +391,13 @@ - + + AND ( + (t.auth_status = '4' and t.bdk_status IN ( '1', '2' )) + or (t.auth_status in ('0','6') AND t.inaccount_status = '1' AND t.rzh_yesorno = '0' and t.bzdh is not null) + or t.auth_status in ('2','3','5') + ) + and t.invoice_status = #{invoiceStatus} diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java index e269b54b..b0ba0500 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/RzFpxxExportThread.java @@ -245,7 +245,7 @@ public class RzFpxxExportThread extends BaseThread { if (!"99".equals(rzclzt) && StringUtils.isNotBlank(rzclzt)) { pramsMap.put("rzclzt", rzclzt); } else { - pramsMap.put("rzclzt", ""); + pramsMap.put("rzclzt", "99"); } if (!StringUtils.isBlank(invoiceNo)) { if(invoiceNo.length()==8){ diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 3cdd444b..974d6414 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -111,17 +111,24 @@ and t.company = #{company} and t.gf_tax_no = #{gfsh} and t.comp_code = #{companyCode} - - + and t.bdk_status in ('1','2') - + AND t.inaccount_status = '1' AND t.rzh_yesorno = '0' and t.bzdh is not null + + + AND ( + (t.auth_status = '4' and t.bdk_status IN ( '1', '2' )) + or (t.auth_status in ('0','6') AND t.inaccount_status = '1' AND t.rzh_yesorno = '0' and t.bzdh is not null) + or t.auth_status in ('2','3','5') + ) + and t.invoice_status = #{invoiceStatus} @@ -164,9 +171,12 @@ and t.image_id = #{imageId} - + and t.auth_status = #{rzclzt} + + and (t.auth_status = '2' or t.auth_status = '3') + and t.bdk_status = #{rzlx}