From bb9e5b9a86bbd160ecb31f5c228ab54063a241bb Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 13 Jun 2023 15:19:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?ariesy=20=E5=8F=AA=E6=9C=89=E6=9C=89?= =?UTF-8?q?=E6=8A=A5=E8=B4=A6=E4=BF=A1=E6=81=AF=E7=9A=84=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseRzTDxRecordInvoiceServiceImpl.java | 11 +++++++++++ .../src/main/resources/mapper/BaseSggxcxMapper.xml | 3 +++ 2 files changed, 14 insertions(+) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java index c6477147..67f3d18f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseRzTDxRecordInvoiceServiceImpl.java @@ -249,14 +249,17 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl taxList = new ArrayList<>(); List orgList = new ArrayList<>(); List dkList = new ArrayList<>(); @@ -267,6 +270,11 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl curMap = new HashMap<>(); List shList = new ArrayList<>(); shList.add(recordInvoice.getGfTaxNo()); @@ -390,6 +398,9 @@ public class BaseRzTDxRecordInvoiceServiceImpl extends MpBaseServiceImpl and t.bzdh = #{bzdh} + + and t.bzdh is not null + and t.inaccount_status = #{inAccountStatus} From f483ce66d889ffc83b28c4a664e09ab737892d3e Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 13 Jun 2023 16:00:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?ariesy=20=E5=8F=AA=E6=9C=89=E6=9C=89?= =?UTF-8?q?=E6=8A=A5=E8=B4=A6=E4=BF=A1=E6=81=AF=E7=9A=84=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=E8=AE=A4=E8=AF=81=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index ac29d93b..73c42f8e 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -136,6 +136,9 @@ and t.bzdh = #{bzdh} + + and t.bzdh is not null + and t.inaccount_status = #{inAccountStatus} From c0ac79681c84457780699ae31f988cff952db413 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 14 Jun 2023 17:25:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?ariesy=20=E7=AD=9B=E9=80=89=E5=B7=B2?= =?UTF-8?q?=E5=85=A5=E8=B4=A6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 73c42f8e..871ef232 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -137,7 +137,7 @@ and t.bzdh = #{bzdh} - and t.bzdh is not null + and t.bzdh is not null and t.inaccount_status = '1' and t.inaccount_status = #{inAccountStatus} From 7082cdbd1d0be41c8c9cf3702ef0e27f6ce88b2f Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 15 Jun 2023 09:31:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=8F=B7=E7=A0=81=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/core/thread/ManualAthensThread.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java index ada14005..a75f41a0 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/ManualAthensThread.java @@ -140,6 +140,7 @@ public class ManualAthensThread extends BaseThread { String gfsh = prams.getString("gfsh"); String fpzt = prams.getString("invoiceStatus"); String invoiceType = prams.getString("invoiceType"); + String invoiceNo = prams.getString("invoiceNo"); String qszt = prams.getString("qszt"); String qsr = prams.getString("qsr"); String qsfs = prams.getString("qsfs"); @@ -224,6 +225,7 @@ public class ManualAthensThread extends BaseThread { pramsMap.put("inAccountStatus", inAccountStatus); pramsMap.put("company", company); pramsMap.put("invoiceSource",prams.getString("invoiceSource")); + pramsMap.put("invoiceNo",invoiceNo); pramsMap.put("companyCodes",companyCodes); pramsMap.put("companyCode",companyCode); pramsMap.put("snVoucherNumber", prams.getString("snVoucherNumber")); From fd240eec7778b5abc992d0f00bd3114f0059b035 Mon Sep 17 00:00:00 2001 From: yefei Date: Thu, 15 Jun 2023 22:48:58 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=9C=AA=E5=85=A5=E8=B4=A6=E7=AD=9B=E9=80=89=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/BaseSggxcxMapper.xml | 5 ++--- dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 871ef232..ed25fcd5 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -105,13 +105,12 @@ - and (t.comp_code in + and t.comp_code in #{companyCode} - or t.comp_code is null or t.comp_code = '' - ) + and t.comp_code = #{companyCode} diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 28250108..b6d768b3 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -605,14 +605,12 @@ - and (t.comp_code in + and t.comp_code in #{companyCode} - or t.comp_code is null or t.comp_code = '' - ) - + and t.comp_code = #{companyCode}