From b520943126c615e441c6b0f3773f41f8c81e4cd0 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 23 May 2023 16:45:24 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=8A=A5=E8=B4=A6=E4=BA=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAZJBRT=EF=BC=8C=E5=9B=A0=E4=B8=BAZJBR=E6=98=AF?= =?UTF-8?q?=E5=B7=A5=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java index db010c0d..f80d945f 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java @@ -379,7 +379,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl0){ @@ -415,7 +415,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl Date: Tue, 23 May 2023 17:01:35 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java | 6 ++++++ dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 bd3c95ec..57e1bd05 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 @@ -685,6 +685,12 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl Date: Tue, 23 May 2023 17:40:36 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 78362e02..4e4ffd7a 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -78,6 +78,7 @@ and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status != '0' + and t.rzh_yesorno != '0' and t.company = #{company} and t.gf_tax_no in @@ -345,6 +346,7 @@ and t.auth_status != '0' and t.bdk_status in ('1','2') and t.export_mark = '0' + and t.rzh_yesorno != '0' and t.company =#{company} and t.gf_tax_no in @@ -383,7 +385,7 @@ and t.inaccount_status = #{inAccountStatus} - + and t.qs_status = #{qszt} Date: Tue, 23 May 2023 19:32:33 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 96c3c747..220c4702 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -100,6 +100,7 @@ and t.bdk_status in ('1','2') and t.export_mark = '0' and t.auth_status != '0' + and t.rzh_yesorno != '0' and t.company = #{company} and t.gf_tax_no in From 676e89d7a6aadb508d983c13f10dbbdf1799965c Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 23 May 2023 20:26:28 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 10 ++++++++-- .../src/main/resources/mapper/BaseSggxcxMapper.xml | 10 ++++++++-- .../src/main/resources/mapper/ExtBbfpzhMapper.xml | 7 +++++-- .../src/main/resources/mapper/ExtBbycfpcxMapper.xml | 10 ++++++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index 4e4ffd7a..2980ff5a 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -104,9 +104,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.qs_status = #{qszt} @@ -382,9 +385,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.qs_status = #{qszt} diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 750bc91d..3ceba96c 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -124,9 +124,12 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq} @@ -483,9 +486,12 @@ and t.bzdh = #{bzdh} - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and (t.dept_id is null or t.dept_id='' or t.dept_id='99') diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index f0f0d302..7242a31b 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -342,8 +342,11 @@ and t.bzr like concat('%',#{bzr},'%') - - and t.in_account_status = #{inAccountStatus} + + and t.inaccount_status = #{inAccountStatus} + + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) and t.qs_status = #{qszt} diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml index 05efa5e4..3915015b 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbycfpcxMapper.xml @@ -68,9 +68,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.sn_voucher_number = #{snVoucherNumber} @@ -190,9 +193,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.sn_voucher_number = #{snVoucherNumber} From 2479e121b2b220ef05f58e2c1418cef63cb81ee2 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 23 May 2023 20:37:59 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml index 7242a31b..a565392a 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml @@ -80,9 +80,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.invoice_status = #{invoiceStatus} From cf9c6fa59d5cbad083c413b36109d878e7c7889c Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 23 May 2023 20:50:27 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=85=A5=E8=B4=A6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml | 5 ++++- dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml | 5 ++++- dxhy-core/src/main/resources/mapper/FpZhMapper.xml | 10 ++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml index 3a91a151..f361cce6 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml @@ -76,9 +76,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.invoice_status = #{invoiceStatus} diff --git a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml index e6957fc8..ef6ccf33 100644 --- a/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbycfpcxMapper.xml @@ -61,9 +61,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.sn_voucher_number = #{snVoucherNumber} diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml index 220c4702..43c32c20 100644 --- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml @@ -126,9 +126,12 @@ and t.bzr like concat('%',#{bzr},'%') - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and t.qs_status = #{qszt} @@ -607,9 +610,12 @@ and t.suspend_date = #{suspendDate} - + and t.inaccount_status = #{inAccountStatus} + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) + and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq} From 40748437b854d51a2b4fdcc4b1fae6b5bb48ad19 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 24 May 2023 08:52:32 +0800 Subject: [PATCH 08/18] =?UTF-8?q?ariesy=20=E6=96=B0=E5=A2=9E=E9=9C=80?= =?UTF-8?q?=E6=B1=82=20:=201.=E5=8F=AA=E6=9C=89=E5=AE=9E=E5=90=8D=E7=9A=84?= =?UTF-8?q?=E5=AE=A2=E8=BF=90=E6=B1=BD=E8=BD=A6=E7=A5=A8=E6=89=8D=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=BB=B7=E7=A8=8E=E5=88=86=E7=A6=BB=202.=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8D=B7=E7=A5=A8=E6=98=8E=E7=BB=86=E8=A1=8C=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/SNPushCheckRecordService.java | 470 +++++++++--------- 1 file changed, 236 insertions(+), 234 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 104df6fd..24d38084 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -105,7 +105,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { return post; } - public String pushInvoiceToRecordInvoice(SNInvoice snInvoice, String taxNo, String company,String imageId,String compCode) throws Exception { + public String pushInvoiceToRecordInvoice(SNInvoice snInvoice, String taxNo, String company, String imageId, String compCode) throws Exception { TDxInvoiceReimburse recordInvoice = new TDxInvoiceReimburse(); // DynamicContextHolder.push(DbConstant.BASICS_READ); @@ -160,7 +160,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { recordInvoice.setInvoiceCode(fpdm); recordInvoice.setInvoiceNo(fphm); String selectId = UUID.randomUUID().toString().replace("-", ""); - log.info("selectId={}",selectId); + log.info("selectId={}", selectId); recordInvoice.setSelectId(selectId); if (je != null) { @@ -169,7 +169,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { if (se != null) { recordInvoice.setTaxAmount(new BigDecimal(se)); } - if (amountTax != null){ + if (amountTax != null) { recordInvoice.setTotalAmount(new BigDecimal(amountTax)); } @@ -193,7 +193,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { return ""; } - public Integer pushInvoiceToRecordInvoice2(SNInvoice snInvoice,String imageId,String compCode) { + public Integer pushInvoiceToRecordInvoice2(SNInvoice snInvoice, String imageId, String compCode) { DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); int update = 0; @@ -318,11 +318,11 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { String returnResult = JSONObject.toJSONString(apiResponse); String returnResultEncode = Base64.encode(returnResult.getBytes()); checkLog.setReturnResult(returnResultEncode); - log.info("封装的查验日志实体为{}",checkLog); + log.info("封装的查验日志实体为{}", checkLog); platformCheckLogService.save(checkLog); } - private JSONObject convertToSnObject(String content, JSONObject jsonObject, String invoiceType) { + private JSONObject convertToSnObject(String content, JSONObject jsonObject, String invoiceType) throws ParseException { String con = new String(Base64.decode(content)); HashMap contentMap = JSONObject.parseObject(con, HashMap.class); @@ -330,266 +330,262 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { if ("0000".equals(contentMap.get("code"))) { HashMap invoiceData = JSONObject.parseObject(contentMap.get("data").toString(), HashMap.class); if ("0001".equals(invoiceData.get("cyjg"))) { - try { - - invoiceType = invoiceData.get("fpzl").toString(); - if ("22".equals(invoiceType)) { - invoiceType = "32"; - } - if ("21".equals(invoiceType)) { - invoiceType = "31"; - } + invoiceType = invoiceData.get("fpzl").toString(); + if ("22".equals(invoiceType)) { + invoiceType = "32"; + } + if ("21".equals(invoiceType)) { + invoiceType = "31"; + } - jsonObject.put("invoiceType", invoiceType); - jsonObject.put("administrativeDivisionNo", ""); - jsonObject.put("administrativeDivisionName", ""); - - jsonObject.put("invoiceCode", invoiceData.get("fpdm")); - jsonObject.put("invoiceNumber", invoiceData.get("fphm")); - - String kprq = invoiceData.get("kprq").toString(); - Date formatDat = new SimpleDateFormat("yyyyMMdd").parse(kprq); - String str = new SimpleDateFormat("yyyy-MM-dd").format(formatDat); - log.info("开票日期为:{} ", str); - - jsonObject.put("billingDate", str); - jsonObject.put("purchaserName", invoiceData.get("gmfmc")); - jsonObject.put("purchaserTaxNo", invoiceData.get("gmfsbh")); - jsonObject.put("purchaserBank", invoiceData.get("gmfyhzh")); - jsonObject.put("purchaserAddressPhone", invoiceData.get("gmfdzdh")); - jsonObject.put("salesName", invoiceData.get("xhfmc")); - jsonObject.put("salesTaxNo", invoiceData.get("xhfsbh")); - jsonObject.put("salesAddressPhone", invoiceData.get("xhfdzdh")); - if(FplxEnum.JDC.getFplxDm().equals(invoiceType)){ - if(invoiceData.get("khyh") != null && invoiceData.get("khzh") != null) { - jsonObject.put("salesBank", invoiceData.get("khyh").toString() + invoiceData.get("khzh").toString()); - } - }else{ - jsonObject.put("salesBank", invoiceData.get("xhfyhzh")); + jsonObject.put("invoiceType", invoiceType); + jsonObject.put("administrativeDivisionNo", ""); + jsonObject.put("administrativeDivisionName", ""); + + jsonObject.put("invoiceCode", invoiceData.get("fpdm")); + jsonObject.put("invoiceNumber", invoiceData.get("fphm")); + + String kprq = invoiceData.get("kprq").toString(); + Date formatDat = new SimpleDateFormat("yyyyMMdd").parse(kprq); + String str = new SimpleDateFormat("yyyy-MM-dd").format(formatDat); + log.info("开票日期为:{} ", str); + + jsonObject.put("billingDate", str); + jsonObject.put("purchaserName", invoiceData.get("gmfmc")); + jsonObject.put("purchaserTaxNo", invoiceData.get("gmfsbh")); + jsonObject.put("purchaserBank", invoiceData.get("gmfyhzh")); + jsonObject.put("purchaserAddressPhone", invoiceData.get("gmfdzdh")); + jsonObject.put("salesName", invoiceData.get("xhfmc")); + jsonObject.put("salesTaxNo", invoiceData.get("xhfsbh")); + jsonObject.put("salesAddressPhone", invoiceData.get("xhfdzdh")); + if (FplxEnum.JDC.getFplxDm().equals(invoiceType)) { + if (invoiceData.get("khyh") != null && invoiceData.get("khzh") != null) { + jsonObject.put("salesBank", invoiceData.get("khyh").toString() + invoiceData.get("khzh").toString()); } + } else { + jsonObject.put("salesBank", invoiceData.get("xhfyhzh")); + } + jsonObject.put("totalAmount", invoiceData.get("fpje")); + if ("11".equals(invoiceData.get("fpzl"))) { + jsonObject.put("totalTax", "0"); + jsonObject.put("totalAmount", "0"); + } else { + jsonObject.put("totalTax", invoiceData.get("fpse")); jsonObject.put("totalAmount", invoiceData.get("fpje")); - if ("11".equals(invoiceData.get("fpzl"))) { - jsonObject.put("totalTax", "0"); - jsonObject.put("totalAmount", "0"); - } else { - jsonObject.put("totalTax", invoiceData.get("fpse")); - jsonObject.put("totalAmount", invoiceData.get("fpje")); - } - if("15".equals(invoiceData.get("fpzl"))){ - jsonObject.put("amountTax", invoiceData.get("cjhj")); - }else{ - jsonObject.put("amountTax", invoiceData.get("jshj")); - } + } + if ("15".equals(invoiceData.get("fpzl"))) { + jsonObject.put("amountTax", invoiceData.get("cjhj")); + } else { + jsonObject.put("amountTax", invoiceData.get("jshj")); + } - jsonObject.put("amountTaxCN", ""); + jsonObject.put("amountTaxCN", ""); - jsonObject.put("checkCode", invoiceData.get("jym")); - if ("N".equals(invoiceData.get("zfbz"))) { - jsonObject.put("state", "0"); - } else if ("H".equals(invoiceData.get("zfbz"))) { - jsonObject.put("state", "2"); - } else if ("Y".equals(invoiceData.get("zfbz"))) { - jsonObject.put("state", "1"); - } + jsonObject.put("checkCode", invoiceData.get("jym")); + if ("N".equals(invoiceData.get("zfbz"))) { + jsonObject.put("state", "0"); + } else if ("H".equals(invoiceData.get("zfbz"))) { + jsonObject.put("state", "2"); + } else if ("Y".equals(invoiceData.get("zfbz"))) { + jsonObject.put("state", "1"); + } - jsonObject.put("carrierName", invoiceData.get("cyrmc")); - jsonObject.put("carrierTaxNo", invoiceData.get("cyrsbh")); - jsonObject.put("draweeName", invoiceData.get("spfmc")); - jsonObject.put("draweeTaxNo", invoiceData.get("spfsbh")); - jsonObject.put("cargoInformation", invoiceData.get("ysgwxx")); - jsonObject.put("transportRoute", invoiceData.get("qydjyddd")); - jsonObject.put("machineCode", invoiceData.get("skph")); - jsonObject.put("tonnage", invoiceData.get("ccdw")); - jsonObject.put("taxAuthorityNo", invoiceData.get("zgswjgdm")); - jsonObject.put("taxAuthorityName", invoiceData.get("zgswjgmc")); - if ("03".equals(invoiceData.get("fpzl"))) { - jsonObject.put("administrativeDivisionNo", invoiceData.get("zgswjgdm")); - jsonObject.put("administrativeDivisionName", invoiceData.get("zgswjgmc")); - } - jsonObject.put("remarks", invoiceData.get("bz")); - jsonObject.put("vehicleType", invoiceData.get("cllx")); - jsonObject.put("brandModel", invoiceData.get("cpxh")); - jsonObject.put("originPlace", invoiceData.get("cd")); - jsonObject.put("certificateNo", invoiceData.get("hgzs")); - jsonObject.put("inspectionListNo", invoiceData.get("sjdh")); - jsonObject.put("engineNo", invoiceData.get("fdjhm")); - jsonObject.put("vehicleNo", invoiceData.get("clsbh")); - jsonObject.put("importCertificateNo", invoiceData.get("jszmsh")); - jsonObject.put("paymentVoucherNo", invoiceData.get("wspzhm")); - jsonObject.put("passengersLimited", invoiceData.get("xcrs")); - if (invoiceData.get("txfbz") != null && "Y".equals(invoiceData.get("txfbz"))) { - jsonObject.put("tollSign", "06"); - } else { - jsonObject.put("tollSign", "07"); - } + jsonObject.put("carrierName", invoiceData.get("cyrmc")); + jsonObject.put("carrierTaxNo", invoiceData.get("cyrsbh")); + jsonObject.put("draweeName", invoiceData.get("spfmc")); + jsonObject.put("draweeTaxNo", invoiceData.get("spfsbh")); + jsonObject.put("cargoInformation", invoiceData.get("ysgwxx")); + jsonObject.put("transportRoute", invoiceData.get("qydjyddd")); + jsonObject.put("machineCode", invoiceData.get("skph")); + jsonObject.put("tonnage", invoiceData.get("ccdw")); + jsonObject.put("taxAuthorityNo", invoiceData.get("zgswjgdm")); + jsonObject.put("taxAuthorityName", invoiceData.get("zgswjgmc")); + if ("03".equals(invoiceData.get("fpzl"))) { + jsonObject.put("administrativeDivisionNo", invoiceData.get("zgswjgdm")); + jsonObject.put("administrativeDivisionName", invoiceData.get("zgswjgmc")); + } + jsonObject.put("remarks", invoiceData.get("bz")); + jsonObject.put("vehicleType", invoiceData.get("cllx")); + jsonObject.put("brandModel", invoiceData.get("cpxh")); + jsonObject.put("originPlace", invoiceData.get("cd")); + jsonObject.put("certificateNo", invoiceData.get("hgzs")); + jsonObject.put("inspectionListNo", invoiceData.get("sjdh")); + jsonObject.put("engineNo", invoiceData.get("fdjhm")); + jsonObject.put("vehicleNo", invoiceData.get("clsbh")); + jsonObject.put("importCertificateNo", invoiceData.get("jszmsh")); + jsonObject.put("paymentVoucherNo", invoiceData.get("wspzhm")); + jsonObject.put("passengersLimited", invoiceData.get("xcrs")); + if (invoiceData.get("txfbz") != null && "Y".equals(invoiceData.get("txfbz"))) { + jsonObject.put("tollSign", "06"); + } else { + jsonObject.put("tollSign", "07"); + } - jsonObject.put("zeroTaxRateSign", invoiceData.get("lslbs")); - log.info("零税率标识为:{}", invoiceData.get("lslbs")); - jsonObject.put("source", ""); - jsonObject.put("idcardNo", invoiceData.get("sfzh")); + jsonObject.put("zeroTaxRateSign", invoiceData.get("lslbs")); + log.info("零税率标识为:{}", invoiceData.get("lslbs")); + jsonObject.put("source", ""); + jsonObject.put("idcardNo", invoiceData.get("sfzh")); - if("15".equals(invoiceData.get("fpzl"))){ - jsonObject.put("buyerIDNum", invoiceData.get("mfdwdmsfzh")); - }else{ - jsonObject.put("buyerIDNum", invoiceData.get("sfzh")); - } + if ("15".equals(invoiceData.get("fpzl"))) { + jsonObject.put("buyerIDNum", invoiceData.get("mfdwdmsfzh")); + } else { + jsonObject.put("buyerIDNum", invoiceData.get("sfzh")); + } - jsonObject.put("vehicleType", invoiceData.get("cllx")); - jsonObject.put("factoryModel", invoiceData.get("cpxh")); - jsonObject.put("productPlace", invoiceData.get("cd")); - jsonObject.put("certificate", invoiceData.get("hgzs")); - jsonObject.put("certificateImport", invoiceData.get("jszmsh")); - jsonObject.put("inspectionNum", invoiceData.get("sjdh")); - jsonObject.put("engineNo", invoiceData.get("fdjhm")); - jsonObject.put("vehicleNo", invoiceData.get("clsbh")); - jsonObject.put("engineNo", invoiceData.get("fdjhm")); - jsonObject.put("taxBureauCode", invoiceData.get("zgswjgdm")); - jsonObject.put("taxBureauName", invoiceData.get("zgswjgmc")); - jsonObject.put("taxBureauCode", invoiceData.get("zgswjgdm")); - jsonObject.put("taxRecords", invoiceData.get("wspzhm")); - jsonObject.put("tonnage", invoiceData.get("dw")); - jsonObject.put("limitPeople", invoiceData.get("xcrs")); - String taxRate = ""; - if ("免税".equals(invoiceData.get("sl"))) { - taxRate = "0"; - jsonObject.put("taxRate", taxRate); - } else { - if (invoiceData.get("sl") != null && StringUtils.isNoneBlank(invoiceData.get("sl").toString())) { - taxRate = invoiceData.get("sl").toString(); - if (!"0".equals(taxRate)) { - taxRate = "0." + taxRate; - taxRate = taxRate.substring(0, taxRate.length() - 1); - } + jsonObject.put("vehicleType", invoiceData.get("cllx")); + jsonObject.put("factoryModel", invoiceData.get("cpxh")); + jsonObject.put("productPlace", invoiceData.get("cd")); + jsonObject.put("certificate", invoiceData.get("hgzs")); + jsonObject.put("certificateImport", invoiceData.get("jszmsh")); + jsonObject.put("inspectionNum", invoiceData.get("sjdh")); + jsonObject.put("engineNo", invoiceData.get("fdjhm")); + jsonObject.put("vehicleNo", invoiceData.get("clsbh")); + jsonObject.put("engineNo", invoiceData.get("fdjhm")); + jsonObject.put("taxBureauCode", invoiceData.get("zgswjgdm")); + jsonObject.put("taxBureauName", invoiceData.get("zgswjgmc")); + jsonObject.put("taxBureauCode", invoiceData.get("zgswjgdm")); + jsonObject.put("taxRecords", invoiceData.get("wspzhm")); + jsonObject.put("tonnage", invoiceData.get("dw")); + jsonObject.put("limitPeople", invoiceData.get("xcrs")); + String taxRate = ""; + if ("免税".equals(invoiceData.get("sl"))) { + taxRate = "0"; + jsonObject.put("taxRate", taxRate); + } else { + if (invoiceData.get("sl") != null && StringUtils.isNoneBlank(invoiceData.get("sl").toString())) { + taxRate = invoiceData.get("sl").toString(); + if (!"0".equals(taxRate)) { + taxRate = "0." + taxRate; + taxRate = taxRate.substring(0, taxRate.length() - 1); + } - if ("11".equals(invoiceType)) { - taxRate = "0.000"; - } - log.info("明细-发票税率为:{}", taxRate); - jsonObject.put("taxRate", taxRate); + if ("11".equals(invoiceType)) { + taxRate = "0.000"; } + log.info("明细-发票税率为:{}", taxRate); + jsonObject.put("taxRate", taxRate); } - taxRate = ""; - jsonObject.put("limitPeople", invoiceData.get("xcrs")); - jsonObject.put("machineNo", invoiceData.get("jqbh")); - - jsonObject.put("licensePlate", invoiceData.get("cpzh")); - jsonObject.put("registrationNo", invoiceData.get("djzh")); - jsonObject.put("vehicleIdentificationNo", invoiceData.get("clsbh")); - jsonObject.put("vehicleAdminOffice", invoiceData.get("zrdcgsmc")); - jsonObject.put("buyerUnitOrIndividual", invoiceData.get("mfdwgr")); - jsonObject.put("buyerUnitOrIndividualAddress", invoiceData.get("mfdwgrdz")); - jsonObject.put("buyerPhone", invoiceData.get("mfdh")); - jsonObject.put("sellerUnitOrIndividual", invoiceData.get("smfdwgr")); - jsonObject.put("sellerUnitCodeOrIdNo", invoiceData.get("smfdwdmsfzh")); - jsonObject.put("sellerUnitOrIndividualAddress", invoiceData.get("smfdwgrzz")); - jsonObject.put("sellerPhone", invoiceData.get("smfdh")); - jsonObject.put("businessUnit", invoiceData.get("jypmdw")); - jsonObject.put("businessUnitAddress", invoiceData.get("jypmdwdz")); - jsonObject.put("businessUnitTaxNo", invoiceData.get("jypmdwzsbh")); - jsonObject.put("businessUnitBankAndAccount", invoiceData.get("khyhjzh")); - jsonObject.put("businessUnitPhone", invoiceData.get("jypmdwdh")); - jsonObject.put("lemonMarket", invoiceData.get("escsc")); - jsonObject.put("lemonMarketTaxNo", invoiceData.get("escscsbh")); - jsonObject.put("lemonMarketAddress", invoiceData.get("escscdz")); - jsonObject.put("lemonMarketBankAndAccount", invoiceData.get("escsckhyhzh")); - jsonObject.put("lemonMarketPhone", invoiceData.get("escscdh")); - - List> returnDetailList = new ArrayList<>(); - JSONArray detailList = (JSONArray) invoiceData.get("detailList"); - - for (int i = 0; i < detailList.size(); i++) { - String taxRateDetail = ""; - JSONObject detail = (JSONObject) detailList.get(i); - Map snDetailMap = new HashMap(); - snDetailMap.put("rowNo", i + 1 + ""); - snDetailMap.put("commodityCode", detail.getString("ssflbm")); - snDetailMap.put("commodityName", detail.getString("hwmc")); - snDetailMap.put("specificationModel", detail.getString("ggxh")); - snDetailMap.put("unit", detail.getString("jldw")); - snDetailMap.put("detailNo",detail.getString("mxbh")); - String quantity = detail.getString("spsl"); + } + taxRate = ""; + jsonObject.put("limitPeople", invoiceData.get("xcrs")); + jsonObject.put("machineNo", invoiceData.get("jqbh")); + + jsonObject.put("licensePlate", invoiceData.get("cpzh")); + jsonObject.put("registrationNo", invoiceData.get("djzh")); + jsonObject.put("vehicleIdentificationNo", invoiceData.get("clsbh")); + jsonObject.put("vehicleAdminOffice", invoiceData.get("zrdcgsmc")); + jsonObject.put("buyerUnitOrIndividual", invoiceData.get("mfdwgr")); + jsonObject.put("buyerUnitOrIndividualAddress", invoiceData.get("mfdwgrdz")); + jsonObject.put("buyerPhone", invoiceData.get("mfdh")); + jsonObject.put("sellerUnitOrIndividual", invoiceData.get("smfdwgr")); + jsonObject.put("sellerUnitCodeOrIdNo", invoiceData.get("smfdwdmsfzh")); + jsonObject.put("sellerUnitOrIndividualAddress", invoiceData.get("smfdwgrzz")); + jsonObject.put("sellerPhone", invoiceData.get("smfdh")); + jsonObject.put("businessUnit", invoiceData.get("jypmdw")); + jsonObject.put("businessUnitAddress", invoiceData.get("jypmdwdz")); + jsonObject.put("businessUnitTaxNo", invoiceData.get("jypmdwzsbh")); + jsonObject.put("businessUnitBankAndAccount", invoiceData.get("khyhjzh")); + jsonObject.put("businessUnitPhone", invoiceData.get("jypmdwdh")); + jsonObject.put("lemonMarket", invoiceData.get("escsc")); + jsonObject.put("lemonMarketTaxNo", invoiceData.get("escscsbh")); + jsonObject.put("lemonMarketAddress", invoiceData.get("escscdz")); + jsonObject.put("lemonMarketBankAndAccount", invoiceData.get("escsckhyhzh")); + jsonObject.put("lemonMarketPhone", invoiceData.get("escscdh")); + + List> returnDetailList = new ArrayList<>(); + JSONArray detailList = (JSONArray) invoiceData.get("detailList"); + + for (int i = 0; i < detailList.size(); i++) { + String taxRateDetail = ""; + JSONObject detail = (JSONObject) detailList.get(i); + Map snDetailMap = new HashMap(); + snDetailMap.put("rowNo", i + 1 + ""); + snDetailMap.put("commodityCode", detail.getString("ssflbm")); + snDetailMap.put("commodityName", detail.getString("hwmc")); + snDetailMap.put("specificationModel", detail.getString("ggxh")); + snDetailMap.put("unit", detail.getString("jldw")); + snDetailMap.put("detailNo", detail.getString("mxbh")); + String quantity = detail.getString("spsl"); // if (quantity.length() > 3) { // int index = quantity.indexOf("."); // quantity = quantity.substring(0, index + 2); // } - snDetailMap.put("quantity", quantity); + snDetailMap.put("quantity", quantity); - String unitPrice = detail.getString("bhsdj"); + String unitPrice = detail.getString("bhsdj"); // if (unitPrice.length() > 3) { // int index = unitPrice.indexOf("."); // unitPrice = unitPrice.substring(0, index + 3); // } - snDetailMap.put("unitPrice", unitPrice); + snDetailMap.put("unitPrice", unitPrice); - if ("11".equals(invoiceType)) { - snDetailMap.put("tax", "0"); - - //如果是卷票计算合计金额 - Float hjje = null; - if (detail.getString("se") != null && detail.getString("je") != null) { - Float je = Float.parseFloat(detail.getString("je")); - Float se = Float.parseFloat(detail.getString("se")); - hjje = je + se; - } - - if (hjje != null) - snDetailMap.put("amount", hjje.toString()); + if ("11".equals(invoiceType)) { + snDetailMap.put("tax", "0"); - } else { - snDetailMap.put("tax", "***".equals(detail.getString("se")) ? "0.00" : detail.getString("se")); - snDetailMap.put("amount", detail.getString("je")); + //如果是卷票计算合计金额 + Float hjje = null; + if (StringUtils.isNotEmpty(detail.getString("se")) && StringUtils.isNotEmpty(detail.getString("je"))) { + Float je = Float.parseFloat(detail.getString("je")); + Float se = Float.parseFloat(detail.getString("se")); + hjje = je + se; } + if (hjje != null) + snDetailMap.put("amount", hjje.toString()); - if ("免税".equals(detail.getString("sl"))) { - taxRateDetail = "0"; - snDetailMap.put("taxRate", taxRateDetail); - } else { - if (detail.get("sl") != null && StringUtils.isNoneBlank(detail.get("sl").toString())) { - taxRateDetail = detail.get("sl").toString(); - if (!"0".equals(taxRateDetail)) { - if (StringUtils.isNoneBlank(taxRateDetail)) { - int index = taxRateDetail.indexOf("%"); - if (index > 0) { - taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); - Float num = Float.parseFloat(taxRateDetail); - if (num > 9) { - taxRateDetail = "0." + taxRateDetail; - } else { - if (!taxRateDetail.startsWith("0")) { - taxRateDetail = "0.0" + taxRateDetail; - } + } else { + snDetailMap.put("tax", "***".equals(detail.getString("se")) ? "0.00" : detail.getString("se")); + snDetailMap.put("amount", detail.getString("je")); + } + + + if ("免税".equals(detail.getString("sl"))) { + taxRateDetail = "0"; + snDetailMap.put("taxRate", taxRateDetail); + } else { + if (detail.get("sl") != null && StringUtils.isNoneBlank(detail.get("sl").toString())) { + taxRateDetail = detail.get("sl").toString(); + if (!"0".equals(taxRateDetail)) { + if (StringUtils.isNoneBlank(taxRateDetail)) { + int index = taxRateDetail.indexOf("%"); + if (index > 0) { + taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); + Float num = Float.parseFloat(taxRateDetail); + if (num > 9) { + taxRateDetail = "0." + taxRateDetail; + } else { + if (!taxRateDetail.startsWith("0")) { + taxRateDetail = "0.0" + taxRateDetail; } } } } + } - if ("11".equals(invoiceType)) { - taxRateDetail = "0.000"; - } - log.info("明细-发票税率为:{}", taxRateDetail); - snDetailMap.put("taxRate", taxRateDetail); + if ("11".equals(invoiceType)) { + taxRateDetail = "0.000"; } + log.info("明细-发票税率为:{}", taxRateDetail); + snDetailMap.put("taxRate", taxRateDetail); } - - log.info("明细-tax={}", detail.get("se")); - log.info("明细-commodityCode={}", detail.get("ssflbm")); - snDetailMap.put("currentDateEnd", detail.getString("txrqz")); - snDetailMap.put("currentDateStart", detail.getString("txrqq")); - snDetailMap.put("licensePlateNum", detail.getString("cph")); - snDetailMap.put("type", detail.getString("lx")); - - returnDetailList.add(snDetailMap); } - jsonObject.put("invoiceLineList", returnDetailList); - } catch (Exception e) { - e.printStackTrace(); + log.info("明细-tax={}", detail.get("se")); + log.info("明细-commodityCode={}", detail.get("ssflbm")); + snDetailMap.put("currentDateEnd", detail.getString("txrqz")); + snDetailMap.put("currentDateStart", detail.getString("txrqq")); + snDetailMap.put("licensePlateNum", detail.getString("cph")); + snDetailMap.put("type", detail.getString("lx")); + + returnDetailList.add(snDetailMap); } + + jsonObject.put("invoiceLineList", returnDetailList); + } else { jsonObject.put("cyjg", invoiceData.get("cyjg")); jsonObject.put("cyjgxx", invoiceData.get("cyjgxx")); @@ -603,7 +599,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { return jsonObject; } - public String updateInvoicePoll(String company, String taxNo, TDxInvoiceReimburse reimburse, SNInvoice invoice, String fplxdm,String imageId,String compCode) throws Exception { + public String updateInvoicePoll(String company, String taxNo, TDxInvoiceReimburse reimburse, SNInvoice invoice, String fplxdm, String imageId, String compCode) throws Exception { String result = "0000"; //判断发票类型 @@ -613,6 +609,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { if (SNFplxEnum.HCP.getFplxDm().equals(fplxdm) || SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm) || SNFplxEnum.JPXCD.getFplxDm().equals(fplxdm) || SNFplxEnum.CP.getFplxDm().equals(fplxdm) || SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)) { + + //0523晚成伟提出新需求，客运汽车票必须实名才可以进行价税分离 + if (SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm) && StringUtils.isEmpty(reimburse.getPassenger()) || StringUtils.isEmpty(reimburse.getPassengerSFZH())) { + return result; + } + InvoiceInfo invoiceInfo = convertToInvoiceInfo(invoice); log.info("进行价税分离的发票信息为:{}", invoiceInfo); @@ -646,7 +648,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse = convertToReimburse(invoice, reimburse, fplxdm, company); - log.info("插库的发票信息:{}",reimburse); + log.info("插库的发票信息:{}", reimburse); DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE); int insert = 0; @@ -655,7 +657,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { TDxInvoiceReimburse reimburse1 = tDxInvoiceReimburseService.getBaseMapper().selectOne(wrapper); if (reimburse1 != null) { // insert = tDxInvoiceReimburseService.getBaseMapper().updateById(reimburse); - insert = tDxInvoiceReimburseService.getBaseMapper().update(reimburse,wrapper); + insert = tDxInvoiceReimburseService.getBaseMapper().update(reimburse, wrapper); } else { insert = tDxInvoiceReimburseService.getBaseMapper().insert(reimburse); } @@ -668,11 +670,11 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { || "08".equals(fplxdm) || "10".equals(fplxdm) || "11".equals(fplxdm) || "14".equals(fplxdm) || "15".equals(fplxdm) || "31".equals(fplxdm) || "32".equals(fplxdm)) { //可查验发票,已入库,更新票池 - Integer integer = this.pushInvoiceToRecordInvoice2(invoice,imageId,compCode); + Integer integer = this.pushInvoiceToRecordInvoice2(invoice, imageId, compCode); log.info("可查验发票，更新底账库完成"); } else { //不可查验发票,未入库,插入票池 - this.pushInvoiceToRecordInvoice(invoice, taxNo, company,imageId,compCode); + this.pushInvoiceToRecordInvoice(invoice, taxNo, company, imageId, compCode); log.info("不可查验发票，插入底账库成功"); } @@ -709,7 +711,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { reimburse.setXfAddressAndPhone(invoice.getSalesAddressPhone()); reimburse.setXfBankAndNo(invoice.getSalesBank()); String uuid = UUID.randomUUID().toString().replace("-", ""); - log.info("uuid={}",uuid); + log.info("uuid={}", uuid); reimburse.setSelectId(uuid); reimburse.setTaxRate(invoice.getTaxRate()); @@ -799,7 +801,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { InvoiceInfo invoice = new InvoiceInfo(); invoice.setInvoiceTypeCode(snInvoice.getInvoiceType()); - if(snInvoice.getBillingDate() != null) { + if (snInvoice.getBillingDate() != null) { Date date = new Date(); SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd"); try { @@ -808,7 +810,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { e.printStackTrace(); } invoice.setInvoiceDate(date); - }else{ + } else { log.error("开票日期为空"); } From e96ee712fc38a634f073e084f1e1151e069eb59d Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 11:32:15 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E5=B7=A5?= =?UTF-8?q?=E8=AA=8D=E8=AD=89=E9=A0=81=E9=9D=A2=E5=88=B0=E8=99=95=E7=A9=BA?= =?UTF-8?q?=E7=A8=85=E8=99=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/thread/ManualAthensThread.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 0aa3686b..fa24b1e0 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 @@ -22,6 +22,7 @@ import com.dxhy.core.service.singletable.IExcelExportlogService; import com.dxhy.core.util.JsonResponseUtils; import com.dxhy.oss.service.FileService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import java.io.File; import java.io.FileOutputStream; @@ -228,14 +229,20 @@ public class ManualAthensThread extends BaseThread { ftpFileName.append(fileSplit); if ("99".equals(gfTaxNo)) { if (gfshList.size() > 0) { - ftpFileName.append(rzFpxxService.getblocName(gfshList.get(0))); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(gfshList.get(0))){ + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(rzFpxxService.getblocName(gfshList.get(0))); + } + ftpFileName.append(fileSplit); + } } } else { if (gfshList.size() > 0) { for (String s : gfshList) { - ftpFileName.append(rzFpxxService.getGfName(s)); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(s)){ + ftpFileName.append(rzFpxxService.getGfName(s)); + ftpFileName.append(fileSplit); + } } } } From 6937764520caa02118c3a67236d1aec59c2b9e42 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 14:21:36 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/core/thread/ManualAthensThread.java | 1 + 1 file changed, 1 insertion(+) 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 fa24b1e0..c3d11cea 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 @@ -234,6 +234,7 @@ public class ManualAthensThread extends BaseThread { ftpFileName.append(rzFpxxService.getblocName(gfshList.get(0))); } ftpFileName.append(fileSplit); + log.info("税号名称获取"); } } } else { From 3a2c4608829808d0723d0e5dfb638bf4d1e7b33b Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 15:17:40 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=B7=E9=97=9C?= =?UTF-8?q?=E7=B9=B3=E6=AC=BE=E6=9B=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/thread/PoolAddTaxThread.java | 13 +++++++++---- .../java/com/dxhy/core/thread/PoolSaleThread.java | 13 +++++++++---- .../com/dxhy/core/thread/QypcsmkpExportThread.java | 13 +++++++++---- .../src/main/resources/mapper/CustomsMapper.xml | 4 ++-- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index 8da04937..8084be48 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -31,6 +31,7 @@ import com.dxhy.oss.service.FileService; import cn.hutool.core.date.DateUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; /** * @author user @@ -214,14 +215,18 @@ public class PoolAddTaxThread extends BaseThread { ftpFileName.append(fileSplit); if ("99".equals(gfTaxNo)) { if (gfshList.size() > 0) { - ftpFileName.append(poolPaperService.getblocName(gfshList.get(0))); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(poolPaperService.getblocName(gfshList.get(0))); + ftpFileName.append(fileSplit); + } } } else { if (gfshList.size() > 0) { for (String s : gfshList) { - ftpFileName.append(poolPaperService.getGfName(s)); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(s)){ + ftpFileName.append(poolPaperService.getGfName(s)); + ftpFileName.append(fileSplit); + } } } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java index 0408d461..39cff42b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java @@ -31,6 +31,7 @@ import com.dxhy.oss.service.FileService; import cn.hutool.core.date.DateUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; /** * 功能描述 @@ -213,14 +214,18 @@ public class PoolSaleThread extends BaseThread { ftpFileName.append(fileSplit); if ("99".equals(gfTaxNo)) { if (gfshList.size() > 0) { - ftpFileName.append(poolPaperService.getblocName(gfshList.get(0))); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(poolPaperService.getblocName(gfshList.get(0))); + ftpFileName.append(fileSplit); + } } } else { if (gfshList.size() > 0) { for (String s : gfshList) { - ftpFileName.append(poolPaperService.getGfName(s)); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(s)){ + ftpFileName.append(poolPaperService.getGfName(s)); + ftpFileName.append(fileSplit); + } } } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java index 135feb8d..e790ee59 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java @@ -22,6 +22,7 @@ import com.dxhy.oss.service.FileService; import cn.hutool.core.date.DateUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; /** * 实名客票 @@ -134,14 +135,18 @@ public class QypcsmkpExportThread extends BaseThread { ftpFileName.append(fileSplit); if ("99".equals(gfTaxNo)) { if (gfshList.size() > 0) { - ftpFileName.append(ticketService.getblocName(gfshList.get(0))); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(ticketService.getblocName(gfshList.get(0))); + ftpFileName.append(fileSplit); + } } } else { if (gfshList.size() > 0) { for (String s : gfshList) { - ftpFileName.append(ticketService.getGfName(s)); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(s)){ + ftpFileName.append(ticketService.getGfName(s)); + ftpFileName.append(fileSplit); + } } } } diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml index d5f95706..8e391017 100644 --- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml @@ -27,7 +27,7 @@ - + @@ -48,7 +48,7 @@ fill_in_date,t.gf_tax_no,t.gf_name,t.tax_amount,t.yx_tax_amount,t.audit_status,t.apply_check,t.check_status,t.qs_status, DATE_FORMAT(t.qs_date,'%Y-%m-%d') qs_date,t.qs_type,t.qs_user,DATE_FORMAT(t.rzh_date,'%Y-%m-%d') rzh_date, t.rzh_yesorno,t.auth_status,t.bdk_status,t.confirm_user,t.rzh_belong_date,t.glzt, - t.customs_scan_id,t.dept_name businessName,t.in_account_status,t.sn_voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date, + t.customs_scan_id,t.dept_name businessName,t.inaccount_status,t.sn_voucher_number,t.document_number,t.in_account_date,rzh_type,rzlx,t.create_date, data_sources,t.image_id,t.posting_time,t.account_period,t.comp_code,t.bzdh from t_dx_customs_record t where export_mark = '0' From 3516014f61426609c4052032b5824d8045cfb3c8 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 15:22:03 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/thread/PoolOtherThread.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java index 5baa3d53..678c7136 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java @@ -19,6 +19,7 @@ import com.dxhy.oss.service.FileService; import cn.hutool.core.date.DateUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; /** * @author user @@ -168,14 +169,18 @@ public class PoolOtherThread extends BaseThread { ftpFileName.append(fileSplit); if ("99".equals(gfTaxNo)) { if (gfshList.size() > 0) { - ftpFileName.append(poolPaperService.getblocName(gfshList.get(0))); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(poolPaperService.getblocName(gfshList.get(0))); + ftpFileName.append(fileSplit); + } } } else { if (gfshList.size() > 0) { for (String s : gfshList) { - ftpFileName.append(poolPaperService.getGfName(s)); - ftpFileName.append(fileSplit); + if (StringUtils.isNotEmpty(s)){ + ftpFileName.append(poolPaperService.getGfName(s)); + ftpFileName.append(fileSplit); + } } } } From 2c06ef82549ca64734c72addd07b7763f15f0961 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 15:43:06 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/thread/ManualAthensThread.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 c3d11cea..10d6b81b 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 @@ -239,11 +239,15 @@ public class ManualAthensThread extends BaseThread { } } else { if (gfshList.size() > 0) { - for (String s : gfshList) { - if (StringUtils.isNotEmpty(s)){ - ftpFileName.append(rzFpxxService.getGfName(s)); +// for (String s : gfshList) { +// if (StringUtils.isNotEmpty(s)){ +// ftpFileName.append(rzFpxxService.getGfName(s)); +// ftpFileName.append(fileSplit); +// } +// } + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(rzFpxxService.getGfName(gfshList.get(0))); ftpFileName.append(fileSplit); - } } } } From 3f54c0432fa38f42200cd61c4f81ea9487ce8d35 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 16:00:07 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/thread/PoolAddTaxThread.java | 14 +++++++++----- .../java/com/dxhy/core/thread/PoolOtherThread.java | 14 +++++++++----- .../java/com/dxhy/core/thread/PoolSaleThread.java | 14 +++++++++----- .../com/dxhy/core/thread/QypcsmkpExportThread.java | 14 +++++++++----- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index 8084be48..1156ea3b 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -222,11 +222,15 @@ public class PoolAddTaxThread extends BaseThread { } } else { if (gfshList.size() > 0) { - for (String s : gfshList) { - if (StringUtils.isNotEmpty(s)){ - ftpFileName.append(poolPaperService.getGfName(s)); - ftpFileName.append(fileSplit); - } +// for (String s : gfshList) { +// if (StringUtils.isNotEmpty(s)){ +// ftpFileName.append(poolPaperService.getGfName(s)); +// ftpFileName.append(fileSplit); +// } +// } + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(poolPaperService.getGfName(gfshList.get(0))); + ftpFileName.append(fileSplit); } } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java index 678c7136..281837e5 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java @@ -176,11 +176,15 @@ public class PoolOtherThread extends BaseThread { } } else { if (gfshList.size() > 0) { - for (String s : gfshList) { - if (StringUtils.isNotEmpty(s)){ - ftpFileName.append(poolPaperService.getGfName(s)); - ftpFileName.append(fileSplit); - } +// for (String s : gfshList) { +// if (StringUtils.isNotEmpty(s)){ +// ftpFileName.append(poolPaperService.getGfName(s)); +// ftpFileName.append(fileSplit); +// } +// } + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(poolPaperService.getGfName(gfshList.get(0))); + ftpFileName.append(fileSplit); } } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java index 39cff42b..67313a8f 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java @@ -221,11 +221,15 @@ public class PoolSaleThread extends BaseThread { } } else { if (gfshList.size() > 0) { - for (String s : gfshList) { - if (StringUtils.isNotEmpty(s)){ - ftpFileName.append(poolPaperService.getGfName(s)); - ftpFileName.append(fileSplit); - } +// for (String s : gfshList) { +// if (StringUtils.isNotEmpty(s)){ +// ftpFileName.append(poolPaperService.getGfName(s)); +// ftpFileName.append(fileSplit); +// } +// } + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(poolPaperService.getGfName(gfshList.get(0))); + ftpFileName.append(fileSplit); } } } diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java index e790ee59..d67a0789 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/QypcsmkpExportThread.java @@ -142,11 +142,15 @@ public class QypcsmkpExportThread extends BaseThread { } } else { if (gfshList.size() > 0) { - for (String s : gfshList) { - if (StringUtils.isNotEmpty(s)){ - ftpFileName.append(ticketService.getGfName(s)); - ftpFileName.append(fileSplit); - } +// for (String s : gfshList) { +// if (StringUtils.isNotEmpty(s)){ +// ftpFileName.append(ticketService.getGfName(s)); +// ftpFileName.append(fileSplit); +// } +// } + if (StringUtils.isNotEmpty(gfshList.get(0))){ + ftpFileName.append(ticketService.getGfName(gfshList.get(0))); + ftpFileName.append(fileSplit); } } } From 76dea7bb9683a368eae54a04e9d41e3ba916ed01 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 16:25:08 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E5=A4=A7=E7=A5=A8=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml index f361cce6..8bacb515 100644 --- a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml +++ b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml @@ -66,6 +66,7 @@ t.settlement_status,t.voucher_number,t.total_amount from t_dx_record_invoice t WHERE t.invoice_date between #{kpksrq} and #{kpjsrq} + and t.company = #{company} and t.gf_tax_no in #{item} From 7caf90bc3d5eb0b756b463b43bffca8a2a93a6d0 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 17:15:57 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E5=A4=A7=E7=A5=A8=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/thread/CustomExportThread.java | 18 ++++++++++++++++++ .../dxhy/core/thread/ManualAthensThread.java | 10 ++++++++++ .../com/dxhy/core/thread/PoolAddTaxThread.java | 16 ++++++++++++++++ .../com/dxhy/core/thread/PoolOtherThread.java | 13 +++++++++++++ .../com/dxhy/core/thread/PoolSaleThread.java | 16 ++++++++++++++++ .../dxhy/core/thread/RzFpxxExportThread.java | 10 ++++++++++ .../main/resources/mapper/CustomsMapper.xml | 4 ++-- .../main/resources/mapper/CustomsMapper.xml | 11 +++++++---- 8 files changed, 92 insertions(+), 6 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java index cf01e457..cd3536dd 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/CustomExportThread.java @@ -2,6 +2,7 @@ package com.dxhy.core.thread; import java.util.*; +import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dxhy.common.service.impl.TabulateRedisServiceImpl; @@ -146,6 +147,16 @@ public class CustomExportThread extends BaseThread { String menuId = prams.getString("menuId"); String bzdh = prams.getString("bzdh"); String bzr = prams.getString("bzr"); + String inAccountStatus = prams.getString("inAccountStatus"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String accountPeriod = prams.getString("accountPeriod"); + if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ + accountPeriod = accountPeriod.substring(0,7); + } + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + String companyCode = prams.getString("companyCode"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); List companyCodes = companyCodeArray.toJavaList(String.class); @@ -159,6 +170,13 @@ public class CustomExportThread extends BaseThread { pramsMap.put("companyCodes",companyCodes); pramsMap.put("bzdh",bzdh); pramsMap.put("bzr",bzr); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("accountPeriod",accountPeriod); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); + List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { 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 10d6b81b..a45e730a 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 @@ -155,6 +155,11 @@ public class ManualAthensThread extends BaseThread { String inAccountStatus = prams.getString("inAccountStatus"); String inAccountMonth = prams.getString("inAccountMonth"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); @@ -164,6 +169,11 @@ public class ManualAthensThread extends BaseThread { pramsMap.put("businessCode",businessCode); pramsMap.put("suspendStatus",suspendStatus); pramsMap.put("suspendDate",suspendDate); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java index 1156ea3b..34456091 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolAddTaxThread.java @@ -152,12 +152,28 @@ public class PoolAddTaxThread extends BaseThread { String bzr = prams.getString("bzr"); String companyCode = prams.getString("companyCode"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String accountPeriod = prams.getString("accountPeriod"); + if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ + accountPeriod = accountPeriod.substring(0,7); + } + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); pramsMap.put("bzdh",bzdh); pramsMap.put("bzr",bzr); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("accountPeriod",accountPeriod); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); + List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java index 281837e5..a08b9f12 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolOtherThread.java @@ -124,12 +124,25 @@ public class PoolOtherThread extends BaseThread { String bzr = prams.getString("bzr"); String bzdh = prams.getString("bzdh"); String inAccountStatus = prams.getString("inAccountStatus"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String accountPeriod = prams.getString("accountPeriod"); + if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ + accountPeriod = accountPeriod.substring(0,7); + } + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); pramsMap.put("bzr",bzr); pramsMap.put("bzdh",bzdh); pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("accountPeriod",accountPeriod); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); diff --git a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java index 67313a8f..00bc2ddd 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java +++ b/dxhy-core/src/main/java/com/dxhy/core/thread/PoolSaleThread.java @@ -157,12 +157,28 @@ public class PoolSaleThread extends BaseThread { String company = prams.getString("company"); String companyCode = prams.getString("companyCode"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String accountPeriod = prams.getString("accountPeriod"); + if (StringUtils.isNotEmpty(accountPeriod) && accountPeriod.length() > 7){ + accountPeriod = accountPeriod.substring(0,7); + } + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + List companyCodes = companyCodeArray.toJavaList(String.class); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(16); pramsMap.put("dbName", dbName); pramsMap.put("bzdh",bzdh); pramsMap.put("bzr",bzr); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("accountPeriod",accountPeriod); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); + List gfshList = new ArrayList<>(); if (!StringHelper.isBlank(gfsh)) { gfshList = StringHelper.stringToList(gfsh); 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 e9dfbde5..b386f99c 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 @@ -141,12 +141,22 @@ public class RzFpxxExportThread extends BaseThread { String bzdh = prams.getString("bzdh"); String bzr = prams.getString("bzr"); JSONArray companyCodeArray = prams.getJSONArray("companyCodes"); + String snVoucherNumber = prams.getString("snVoucherNumber"); + String imageNumber = prams.getString("imageNumber"); + String postingTimeEnd = prams.getString("postingTimeEnd"); + String postingTimeStart = prams.getString("postingTimeStart"); + List companyCodes = companyCodeArray.toJavaList(String.class); JSONObject jsonObject = tabulateRedisService.getTabulateExcel(company, menuId); List businesses = (List)prams.get("userBusiness"); // 参数转换为需要的形式 Map pramsMap = new HashMap<>(30); pramsMap.put("dbName", dbName); + pramsMap.put("inAccountStatus",inAccountStatus); + pramsMap.put("snVoucherNumber",snVoucherNumber); + pramsMap.put("imageNumber",imageNumber); + pramsMap.put("postingTimeEnd",postingTimeEnd); + pramsMap.put("postingTimeStart",postingTimeStart); pramsMap.put("business", businesses); pramsMap.put("businessCode",businessCode); pramsMap.put("qsr",qsr); diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml index 7177b273..41a72c9a 100644 --- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml @@ -124,10 +124,10 @@ and t.rzh_type = #{rzhType} - and t.in_account_status = #{inAccountStatus} + and t.inaccount_status = #{inAccountStatus} - and (t.in_account_status = '0' or t.in_account_status = '' or t.in_account_status is null) + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) and t.qs_type = #{qsfs} diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml index 8e391017..4d0407e5 100644 --- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml @@ -126,10 +126,10 @@ and t.rzh_type = #{rzhType} - and t.in_account_status = #{inAccountStatus} + and t.inaccount_status = #{inAccountStatus} - and (t.in_account_status = '0' or t.in_account_status = '' or t.in_account_status is null) + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) and t.qs_type = #{qsfs} @@ -247,8 +247,11 @@ and t.rzh_type = #{rzhType} - - and t.in_account_status = #{inAccountStatus} + + and t.inaccount_status = #{inAccountStatus} + + + and (t.inaccount_status = '0' or t.inaccount_status = '' or t.inaccount_status is null) and t.qs_type = #{qsfs} From 926ca632fb6ba54989ecfbe03432b8206baedf83 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 24 May 2023 17:31:50 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoicecheck/BaseInvoiceManualCheckServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 57e1bd05..706cf642 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 @@ -200,9 +200,10 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl{}",pageList.get(i).getInAccountStatus()); if ("1".equals(pageList.get(i).getInAccountStatus())) { vo.setInAccountStatus("已入账"); - } { + } else { vo.setInAccountStatus("未入账"); } String suspendStatus = pageList.get(i).getSuspendStatus(); From 9ef0d39f0f9aefdc1a92e4567b9294f084e3a150 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Thu, 25 May 2023 14:25:16 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=80=E9=A1=B9?= =?UTF-8?q?=E5=A2=9E=E5=80=BC=E7=A8=8E=E5=8F=91=E7=A5=A8=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=AD=E7=9A=84payment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ExtInvoicePoolMapper.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 2b5e66c5..a3828245 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -536,10 +536,7 @@ and t.list_status = #{listMark} - - and t.payment_status = #{inAccountStatus} - + and DATE_FORMAT(t.payment_date,'%Y-%m') = #{inAccountMonth}