From f6908a886b653ba29171d9d00a54b5016b1bbdb2 Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 7 Oct 2023 15:55:49 +0800 Subject: [PATCH 01/11] =?UTF-8?q?ariesy=20=E8=AE=A4=E8=AF=81=E4=BA=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=88=90admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index b42f899d..267a4192 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -160,6 +160,10 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl Date: Sat, 7 Oct 2023 16:19:09 +0800 Subject: [PATCH 02/11] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E4=BA=8C?= =?UTF-8?q?=E6=89=8B=E8=BD=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/SDNYMainProcessController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index 9eafc439..2da48ae7 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -807,7 +807,7 @@ public class SDNYMainProcessController extends AbstractController { checkInvoice.put("taxAuthorityNo", vehicleList.getString("taxBureauCode")); checkInvoice.put("taxAuthorityName", vehicleList.getString("taxBureauName")); checkInvoice.put("idcardNo", vehicleList.getString("buyerIdNum")); - checkInvoice.put("amountTax", vehicleList.getString("carPrice")); +// checkInvoice.put("amountTax", vehicleList.getString("carPrice")); } //二手车 if ("15".equals(invoiceType)) { From e4b6913e0d32043cb0d0faf85ca31a1243b586c2 Mon Sep 17 00:00:00 2001 From: yefei Date: Sun, 8 Oct 2023 14:10:05 +0800 Subject: [PATCH 03/11] =?UTF-8?q?ariesy=20=E8=AE=A4=E8=AF=81=E4=BA=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=20=E9=9C=80=E8=A6=81=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=B8=BAadmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customs/service/impl/CustomsRecordDkrzServiceImpl.java | 4 ++++ .../ckzrz/impl/DomesticExportCustomsCkServiceImpl.java | 4 ++++ .../customsrefund/impl/DomesticCustomsRefundServiceImpl.java | 5 +++++ .../drawback/impl/DomesticInvoiceDrawbackServiceImpl.java | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java index 5eccd675..cab90f35 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java @@ -1226,6 +1226,10 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl Date: Tue, 10 Oct 2023 10:19:00 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A4=E8=AF=81=E4=BA=BAadmin=E6=97=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=88=B0=E8=AE=A4=E8=AF=81=E4=BA=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/ExtBbfpzhMapper.xml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index e02ab718..4b44b5f1 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -140,8 +140,17 @@ and t.qs_name = #{qsr} + + - and t.confirm_user like CONCAT(#{rzhr},'%') + + + and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') + + + and t.confirm_user like CONCAT(#{rzhr},'%') + + and t.settlement_no like concat(#{settlementNo},'%') @@ -403,7 +412,14 @@ and t.qs_name = #{qsr} - and t.confirm_user like CONCAT(#{rzhr},'%') + + + and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') + + + and t.confirm_user like CONCAT(#{rzhr},'%') + + and t.glzt = #{glzt} From 0ae8b61383ccf0c1e8d92a568ba1adaa47da0e84 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 10 Oct 2023 15:01:33 +0800 Subject: [PATCH 05/11] =?UTF-8?q?ariesy=20=E5=B7=B2=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E8=AE=A4=E8=AF=81=E8=AF=81=E4=BA=BA?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E6=88=90?= =?UTF-8?q?damin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java | 4 +++- .../customs/service/impl/CustomsRecordDkrzServiceImpl.java | 2 +- .../ckzrz/impl/DomesticExportCustomsCkServiceImpl.java | 6 ++++-- .../impl/DomesticCustomsRefundServiceImpl.java | 2 +- .../drawback/impl/DomesticInvoiceDrawbackServiceImpl.java | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java index 267a4192..a5c26332 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java @@ -160,7 +160,9 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl Date: Wed, 18 Oct 2023 13:54:35 +0800 Subject: [PATCH 06/11] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0throw?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/base/controller/BaseInvoiceController.java | 12 ++++++++---- .../src/main/resources/mapper/BaseFpZhMapper.xml | 5 ++++- 2 files changed, 12 insertions(+), 5 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 3fb07ab0..c03498cd 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 @@ -186,10 +186,14 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("xfmc", xfmc); pramsMap.put("qsr", qsr); if (StringUtils.isNotBlank(rzhr)) { - String[] split = rzhr.split(","); - if (!Arrays.asList(split).contains("")) { - String[] split1 = rzhr.split(","); - pramsMap.put("rzhr", Arrays.asList(split1)); + if("admin".equals(rzhr)){ + pramsMap.put("rzhr", rzhr); + }else { + String[] split = rzhr.split(","); + if (!Arrays.asList(split).contains("")) { + String[] split1 = rzhr.split(","); + pramsMap.put("rzhr", Arrays.asList(split1)); + } } } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 053d5258..c2613178 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -433,12 +433,15 @@ and t.qs_name = #{qsr} - + and t.confirm_user in #{item} + + and (t.confirm_user = #{rzhr} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' + = #{paymentDateStart} ]]> From 60e02298bcf3aeba3a34acdc72c8682b206ad6ae Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 18 Oct 2023 14:15:46 +0800 Subject: [PATCH 07/11] =?UTF-8?q?ariesy=20=E8=AE=A4=E8=AF=81=E4=BA=BA?= =?UTF-8?q?=E6=98=AFadmin=E7=9A=84=E6=97=B6=E5=80=99,=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=B7=B2=E8=AE=A4=E8=AF=81=E7=9A=84=E7=A9=BA=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index c2613178..194e2588 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -155,12 +155,15 @@ and t.qs_name = #{qsr} - + and t.confirm_user in #{item} + + and (t.confirm_user = #{rzhr} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' + and t.invoice_no = #{invoiceNo} From dbcf7f6afff264bf3c5cbe3628a7ad74e4b226d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 7 Nov 2023 14:28:33 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BA=BA=E5=B1=95=E7=A4=BA=E5=92=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CustomsCustomsJkszhcxServiceImpl.java | 2 +- .../ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java | 4 ++++ .../main/resources/mapper/DomesticExportInvoiceMapper.xml | 6 +++++- dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java index 2c784178..c7cdd916 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java @@ -148,7 +148,7 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl - + and p.confirm_user = #{queryParams.confirmUser} + + and (p.confirm_user = #{queryParams.confirmUser} or t.confirm_user is null or t.confirm_user = '') and p.auth_status = '4' + + and p.invoice_type = #{queryParams.invoiceType} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index 4b44b5f1..5e2f8043 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -145,7 +145,7 @@ - and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') + and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' and t.confirm_user like CONCAT(#{rzhr},'%') @@ -414,7 +414,7 @@ - and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') + and (t.confirm_user = 'admin' or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' and t.confirm_user like CONCAT(#{rzhr},'%') From dcc5ab610fe4a1fc2a919801514d5363300eb056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 7 Nov 2023 14:54:31 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BA=BA=E5=B1=95=E7=A4=BA=E5=92=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java | 1 + .../service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java | 1 + .../src/main/resources/mapper/DomesticExportInvoiceMapper.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java index c7cdd916..31fb64aa 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java @@ -148,6 +148,7 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl - and (p.confirm_user = #{queryParams.confirmUser} or t.confirm_user is null or t.confirm_user = '') and p.auth_status = '4' + and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4' From 845ed9b4163231fd95777d1ca9de858a351a4c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 7 Nov 2023 15:16:43 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BA=BA=E5=B1=95=E7=A4=BA=E5=92=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomsCustomsJkszhcxServiceImpl.java | 12 +++++++----- .../impl/DomesticExportInvoiceCkServiceImpl.java | 10 ++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java index 31fb64aa..da06f3ab 100644 --- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java +++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsCustomsJkszhcxServiceImpl.java @@ -140,6 +140,11 @@ public class CustomsCustomsJkszhcxServiceImpl extends MpBaseServiceImpl Date: Tue, 7 Nov 2023 15:46:13 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E4=BA=BA=E5=B1=95=E7=A4=BA=E5=92=8C=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/CustomsJkszhcxMapper.xml | 10 ++++++++-- .../resources/mapper/DomesticExportInvoiceMapper.xml | 12 ++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml index 72bfed55..b6a6b3b6 100644 --- a/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml +++ b/dxhy-customs/src/main/resources/mapper/CustomsJkszhcxMapper.xml @@ -80,9 +80,12 @@ and t.bdk_status = #{bdkStatus} - + and t.confirm_user like CONCAT(#{confirmUser},'%') + + and (t.confirm_user = #{confirmUser} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' + and t.glzt = #{glzt} @@ -245,9 +248,12 @@ and t.bdk_status = #{bdkStatus} - + and t.confirm_user like CONCAT(#{confirmUser},'%') + + and (t.confirm_user = #{confirmUser} or t.confirm_user is null or t.confirm_user = '') and t.auth_status = '4' + and t.glzt = #{glzt} diff --git a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml index dc1fe591..99399a87 100644 --- a/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml +++ b/dxhy-export-domestic/src/main/resources/mapper/DomesticExportInvoiceMapper.xml @@ -376,10 +376,14 @@ and p.export_no = #{queryParams.exportNo} - + and p.confirm_user = #{queryParams.confirmUser} + + and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4' + + and p.invoice_type = #{queryParams.invoiceType} @@ -454,10 +458,14 @@ and p.export_no = #{queryParams.exportNo} - + and p.confirm_user = #{queryParams.confirmUser} + + and (p.confirm_user = #{queryParams.confirmUser} or p.confirm_user is null or p.confirm_user = '') and p.auth_status = '4' + + and p.invoice_type = #{queryParams.invoiceType}