From cc4bfc910bb9ba0066e785673c8eb75df9fcce4f Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 10 May 2023 08:44:49 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/CustomsMapper.xml | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml index 3e248fc1..d350495b 100644 --- a/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/CustomsMapper.xml @@ -51,10 +51,11 @@ t.customs_scan_id,t.dept_name businessName,t.in_account_status,t.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 from t_dx_customs_record t - where export_mark = '0' and t.gf_tax_no in - - #{item} - + where export_mark = '0' + + + + and t.customs_code like CONCAT('%',#{keyWord},'%') @@ -146,6 +147,12 @@ and t.account_period = #{accountPeriod} + + and t.comp_code = #{companyCode} + + + and (t.comp_code = '' or t.comp_code is null) + order by t.fill_in_date desc @@ -155,10 +162,11 @@ count(1) hjsl, sum(t.tax_amount) hjse from t_dx_customs_record t - where export_mark = '0' and t.gf_tax_no in - - #{item} - + where export_mark = '0' + + + + and t.customs_code like CONCAT('%',#{keyWord},'%') @@ -250,6 +258,12 @@ and t.account_period = #{accountPeriod} + + and t.comp_code = #{companyCode} + + + and (t.comp_code = '' or t.comp_code is null) + From 6ddf899f17d83c7b99796f84f2bd0e6993c76c41 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Wed, 10 May 2023 09:48:54 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=87=AD=E8=AF=81=E5=8F=B7=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 d1519048..1574d470 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 @@ -378,6 +378,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl0){ @@ -412,6 +413,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl Date: Wed, 10 May 2023 10:25:56 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtTicketController.java | 1 + .../com/dxhy/extend/entity/JkszhcxRespVO.java | 1 + .../companypool/TicketServiceImpl.java | 4 +-- .../service/customs/CustomsServiceImpl.java | 5 ++-- .../main/resources/mapper/CustomsMapper.xml | 3 +- .../main/resources/mapper/TicketMapper.xml | 28 +++++++++++++------ 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java index 8fa2d27e..f79b1142 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java @@ -60,6 +60,7 @@ public class ExtTicketController extends AbstractController { return ResponseEntity.ok(R.ok().put("data", "")); } } + paramsMap.put("gfsh",gfshList); if (paramsMap.get("invoiceType") != null && !"".equals(paramsMap.get("invoiceType")) && !"99".equals(paramsMap.get("invoiceType"))) { String[] invoiceTypeArr = paramsMap.get("invoiceType").toString().split(","); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java index 3323651f..08c888c9 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/JkszhcxRespVO.java @@ -195,4 +195,5 @@ public class JkszhcxRespVO { private String entryUser; private String filePath; private String businessName; + private String compCode; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java index dd25bcf2..6626fe6b 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/companypool/TicketServiceImpl.java @@ -45,12 +45,12 @@ public class TicketServiceImpl extends MpBaseServiceImpl + @@ -49,7 +50,7 @@ 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.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 + data_sources,t.image_id,t.posting_time,t.account_period,t.comp_code from t_dx_customs_record t where export_mark = '0' diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml index 6323d1c1..0c6878e1 100644 --- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml @@ -26,10 +26,10 @@ and CONCAT(IFNULL(t.passenger,''),IFNULL(t.passenger_s_f_z_h,'')) like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + + + and t.invoice_type in @@ -72,6 +72,12 @@ and t.sn_voucher_number = #{snVoucherNumber} + + and t.comp_code = #{companyCode} + + + and (t.comp_code is null or t.comp_code = '') + @@ -90,10 +96,10 @@ and CONCAT(IFNULL(t.passenger,''),IFNULL(t.passenger_s_f_z_h,'')) like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + + + and t.invoice_type in @@ -136,5 +142,11 @@ and t.sn_voucher_number = #{snVoucherNumber} + + and t.comp_code = #{companyCode} + + + and (t.comp_code is null or t.comp_code = '') + From 0ff56d5fa043d901ac4af5f55787dbe2f09a9384 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 10 May 2023 10:53:56 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/extend/entity/ExtOtherInvoice.java | 1 + .../pool/ExtInvoicePoolServiceImpl.java | 4 ++-- .../resources/mapper/ExtInvoicePoolMapper.xml | 23 +++++++++++++++---- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java index c9ad1d03..47e9ec2e 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/entity/ExtOtherInvoice.java @@ -71,4 +71,5 @@ public class ExtOtherInvoice implements Serializable { private String inAccountStatus; private String bzdh; private String snVoucherNumber; + private String compCode; } diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 977abb1e..ac23168e 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -217,10 +217,10 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl AND CONCAT(IFNULL(invoice_code,''),IFNULL(invoice_no,'')) like CONCAT('%',#{keyWord},'%') - AND gf_tax_no in - - #{item} - + + + + AND invoice_type = #{invoiceType} @@ -317,6 +317,12 @@ and sn_voucher_number = #{snVoucherNumber} + + and comp_code = #{companyCode} + + + and (comp_code is null or comp_code = '') + GROUP BY uuid having min(create_date) ) t From f25d2d37c1aacd0c82150d3c3b37d658267c09a3 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 10 May 2023 11:17:57 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ExtInvoicePoolMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index c22a7733..977a6a89 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -356,10 +356,10 @@ AND create_date between #{cjksyf} and #{cjjsyf} - AND gf_tax_no in - - #{item} - + + + + AND invoice_date between #{kpksrq} and #{kpjsrq} From 2d394e6017f03d2682c7e7b482a7e3a2ef55885a Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 10 May 2023 14:17:32 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtInvoicePoolController.java | 7 +++++++ .../resources/mapper/ExtInvoicePoolMapper.xml | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java index 84b58eb1..67e0afdb 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java @@ -10,7 +10,9 @@ import javax.annotation.Resource; import com.dxhy.auth.client.annotation.IgnoreClientToken; import com.dxhy.auth.client.annotation.IgnoreUserToken; +import com.dxhy.common.util.StringHelper; import com.dxhy.common.vo.TaxOrgCode; +import com.dxhy.common.vo.UserInfo; import com.dxhy.extend.entity.PullRecordReq; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; @@ -169,6 +171,11 @@ public class ExtInvoicePoolController extends AbstractController { pramsMap.put("accountPeriod", accountPeriod); log.info("accountPeriod:{}",accountPeriod); } + String companyCode = (String) pramsMap.get("companyCode"); + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ + pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); + log.info("组织编码===>{}", pramsMap.get("companyCodes")); + } int curr = (int)pramsMap.get("curr"); int size = (int)pramsMap.get("size"); try { diff --git a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 977a6a89..2633ad82 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -317,6 +317,14 @@ and sn_voucher_number = #{snVoucherNumber} + + and (comp_code in + + #{companyCode} + + or comp_code is null or comp_code = '' + ) + and comp_code = #{companyCode} @@ -403,6 +411,14 @@ and bzdh = #{bzdh} + + and (comp_code in + + #{companyCode} + + or comp_code is null or comp_code = '' + ) + and comp_code = #{companyCode} From ba60c222798212dbcd35dc25c744a6230a3d3672 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 10 May 2023 14:53:51 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtCustomsController.java | 6 ++++ .../controller/ExtInvoicePoolController.java | 5 +++ .../controller/ExtTicketController.java | 6 ++++ .../pool/ExtInvoicePoolServiceImpl.java | 4 +-- .../main/resources/mapper/CustomsMapper.xml | 16 ++++++++++ .../resources/mapper/ExtInvoicePoolMapper.xml | 31 ++++++++++++++++++- .../main/resources/mapper/TicketMapper.xml | 16 ++++++++++ 7 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java index ed14aa94..564957a6 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java @@ -3,6 +3,7 @@ package com.dxhy.extend.controller; import com.dxhy.common.aspect.SysLog; import com.dxhy.common.constant.CommonConstants; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.util.StringHelper; import com.dxhy.common.util.UserInfoUtil; import com.dxhy.common.utils.DateUtils; import com.dxhy.common.utils.R; @@ -143,6 +144,11 @@ public class ExtCustomsController extends AbstractController { pramsMap.put("postingTimeEnd", DateUtils.getNight(DateUtils.strToDate(pramsMap.get("postingTimeEnd").toString()))); } + String companyCode = (String) pramsMap.get("companyCode"); + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ + pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); + log.info("组织编码为====>{}",pramsMap.get("companyCodes")); + } log.info("请求列表的参数为:{}",pramsMap); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java index 67e0afdb..3cbd17fd 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java @@ -98,6 +98,11 @@ public class ExtInvoicePoolController extends AbstractController { } int curr = (int)pramsMap.get("curr"); int size = (int)pramsMap.get("size"); + String companyCode = (String) pramsMap.get("companyCode"); + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ + pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); + log.info("组织机构====>{}",pramsMap.get("companyCodes")); + } try { return ResponseEntity.ok(R.ok().put("data", extInvoicePoolService.listAddTax(pramsMap, curr, size))); } catch (Exception e) { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java index f79b1142..b9c93f64 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.dxhy.common.aspect.SysLog; import com.dxhy.common.constant.CommonConstants; import com.dxhy.common.controller.AbstractController; +import com.dxhy.common.util.StringHelper; import com.dxhy.common.util.UserInfoUtil; import com.dxhy.common.utils.DateUtils; import com.dxhy.common.utils.R; @@ -108,6 +109,11 @@ public class ExtTicketController extends AbstractController { } int curr = (int)paramsMap.get("curr"); int size = (int)paramsMap.get("size"); + String companyCode = (String) paramsMap.get("companyCode"); + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ + paramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); + log.info("组织编码======>{}",paramsMap.get("companyCodes")); + } try { return ResponseEntity.ok(R.ok().put("data", ticketService.queryList(paramsMap, curr, size))); } catch (Exception e) { diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index ac23168e..1b092c91 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -49,13 +49,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl and t.account_period = #{accountPeriod} + + and (t.comp_code in + + #{companyCode} + + or t.comp_code is null or t.comp_code = '' + ) + and t.comp_code = #{companyCode} @@ -259,6 +267,14 @@ and t.account_period = #{accountPeriod} + + 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-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml index 2633ad82..47b0f487 100644 --- a/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/ExtInvoicePoolMapper.xml @@ -130,6 +130,20 @@ and t.invoice_source = #{invoiceSource} + + and (t.comp_code in + + #{companyCode} + + or t.comp_code is null or t.comp_code = '' + ) + + + and t.comp_code = #{companyCode} + + + and (t.comp_code = '' or t.comp_code is null) + and t.invoice_type not in ('91','95','97','99','101','00') diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml index 0c6878e1..c3f6c37e 100644 --- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml @@ -72,6 +72,14 @@ and t.sn_voucher_number = #{snVoucherNumber} + + and (t.comp_code in + + #{companyCode} + + or t.comp_code is null or t.comp_code = '' + ) + and t.comp_code = #{companyCode} @@ -142,6 +150,14 @@ and t.sn_voucher_number = #{snVoucherNumber} + + and (t.comp_code in + + #{companyCode} + + or t.comp_code is null or t.comp_code = '' + ) + and t.comp_code = #{companyCode} From d52e6e075d9b8151fe993352575596a8380e8b92 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 10 May 2023 15:09:47 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtInvoicePoolController.java | 4 ++ .../pool/ExtInvoicePoolServiceImpl.java | 4 +- .../resources/mapper/ExtInvoicePoolMapper.xml | 61 ++++++++++++++----- 3 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java index 3cbd17fd..1962c364 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java @@ -242,6 +242,10 @@ public class ExtInvoicePoolController extends AbstractController { } int curr = (int)pramsMap.get("curr"); int size = (int)pramsMap.get("size"); + String companyCode = (String) pramsMap.get("companyCode"); + if (StringHelper.isNotBlank(companyCode) && "99".equals(companyCode)){ + pramsMap.put("companyCodes",getUserInfo().getCompanyCodes()); + } try { return ResponseEntity.ok(Objects .requireNonNull(R.ok().put("data", extInvoicePoolService.listSaleInvoice(pramsMap, curr, size)))); diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 1b092c91..a4aa075b 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -310,13 +310,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl - and t.gf_tax_no in - - #{item} - + + + + and t.invoice_type = #{invoiceType} @@ -208,10 +208,10 @@ like CONCAT('%',#{keyWord},'%') - and t.gf_tax_no in - - #{item} - + + + + and t.invoice_type = #{invoiceType} @@ -474,10 +474,10 @@ like CONCAT('%',#{keyWord},'%') - and t.xf_tax_no in - - #{item} - + + + + and t.invoice_type = #{invoiceType} @@ -539,6 +539,20 @@ and t.bzdh = #{bzdh} + + and (t.comp_code in + + #{companyCode} + + or t.comp_code is null or t.comp_code = '' + ) + + + and t.comp_code = #{companyCode} + + + and (t.comp_code = '' or t.comp_code is null) + From 9fb7c065a350bb317b0649b2eeda532f3b239303 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Wed, 10 May 2023 16:14:21 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/dao/TdxPlatformCheckLogDao.java | 9 +++++ .../dxhy/erp/entity/TdxPlatformCheckLog.java | 34 +++++++++++++++++++ .../service/TdxPlatformCheckLogService.java | 7 ++++ .../impl/TdxPlatformCheckLogServiceImpl.java | 11 ++++++ 4 files changed, 61 insertions(+) create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxPlatformCheckLogDao.java create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxPlatformCheckLog.java create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/service/TdxPlatformCheckLogService.java create mode 100644 dxhy-erp/src/main/java/com/dxhy/erp/service/impl/TdxPlatformCheckLogServiceImpl.java diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxPlatformCheckLogDao.java b/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxPlatformCheckLogDao.java new file mode 100644 index 00000000..a58164ba --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/dao/TdxPlatformCheckLogDao.java @@ -0,0 +1,9 @@ +package com.dxhy.erp.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dxhy.erp.entity.TdxPlatformCheckLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface TdxPlatformCheckLogDao extends BaseMapper { +} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxPlatformCheckLog.java b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxPlatformCheckLog.java new file mode 100644 index 00000000..652e3302 --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/entity/TdxPlatformCheckLog.java @@ -0,0 +1,34 @@ +package com.dxhy.erp.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("t_dx_platform_check_log") +public class TdxPlatformCheckLog implements Serializable { + + private static final long serialVersionUID = -6703830991573450761L; + + //id + private Long id; + + //发票代码 + private String invoiceCode; + + //发票号码 + private String invoiceNo; + + //请求参数 + private String requesPrams; + + //返回结果 + private String returnResult; + + //查验时间 + private Date chaeckDate; + +} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/TdxPlatformCheckLogService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/TdxPlatformCheckLogService.java new file mode 100644 index 00000000..31ec689f --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/TdxPlatformCheckLogService.java @@ -0,0 +1,7 @@ +package com.dxhy.erp.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.dxhy.erp.entity.TdxPlatformCheckLog; + +public interface TdxPlatformCheckLogService extends IService { +} diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/TdxPlatformCheckLogServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/TdxPlatformCheckLogServiceImpl.java new file mode 100644 index 00000000..7070e385 --- /dev/null +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/TdxPlatformCheckLogServiceImpl.java @@ -0,0 +1,11 @@ +package com.dxhy.erp.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dxhy.erp.dao.TdxPlatformCheckLogDao; +import com.dxhy.erp.entity.TdxPlatformCheckLog; +import com.dxhy.erp.service.TdxPlatformCheckLogService; +import org.springframework.stereotype.Service; + +@Service +public class TdxPlatformCheckLogServiceImpl extends ServiceImpl implements TdxPlatformCheckLogService { +} From 87a0626658c4c4dfc4dd26879d1036c710482542 Mon Sep 17 00:00:00 2001 From: yefei Date: Wed, 10 May 2023 17:20:47 +0800 Subject: [PATCH 10/10] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/core/job/service/impl/ApplyServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java index 1388b494..fe03e09c 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/ApplyServiceImpl.java @@ -160,6 +160,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } } @@ -295,6 +296,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } @@ -304,6 +306,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e1.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e1); } } } @@ -493,6 +496,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } } @@ -612,6 +616,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } @@ -621,6 +626,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e1.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e1); } } @@ -905,6 +911,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e); } } @@ -920,6 +927,7 @@ public class ApplyServiceImpl extends ServiceImpl implem tDxHttpLog.setStatus("2"); confirmDao.insert(tDxHttpLog); e1.printStackTrace(); + log.error("执行定时任务报错,报错信息是:{}",e1); } } }