From b89ecc539789ce36c14af5b683bef79f3337ea15 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Sun, 7 May 2023 17:51:27 +0800 Subject: [PATCH 01/15] =?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/java/com/dxhy/extend/controller/ExtIndexController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java index 686f164c..6cfcc279 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java @@ -47,6 +47,7 @@ public class ExtIndexController extends AbstractController { if (gfshList.size() > 0) { DynamicContextHolder.push(getUserInfo().getDbName() + DbConstant.BUSINESS_READ); Integer orgNum = indexStatisticsService.getOrgType(gfshList); + log.info("查询到的数量为：{}",orgNum); if (orgNum != null && orgNum > 0) { return ResponseEntity.ok(R.ok().put("data", "1")); } From 8359009f1d2f04cf59ee3ebd28edb43d612d3ad7 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Sun, 7 May 2023 18:17:39 +0800 Subject: [PATCH 02/15] =?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/java/com/dxhy/extend/controller/ExtIndexController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java index 6cfcc279..734a0376 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtIndexController.java @@ -49,6 +49,7 @@ public class ExtIndexController extends AbstractController { Integer orgNum = indexStatisticsService.getOrgType(gfshList); log.info("查询到的数量为：{}",orgNum); if (orgNum != null && orgNum > 0) { + log.info("查询数量不为空"); return ResponseEntity.ok(R.ok().put("data", "1")); } return ResponseEntity.ok(R.ok().put("data", "0")); From f15cc2a3c243c75eae36798fedc3dd8b4bdd480b Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 8 May 2023 10:16:23 +0800 Subject: [PATCH 03/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=85=8D?= =?UTF-8?q?=E7=A8=8E=E7=A8=8E=E9=A2=9D=E4=B8=BA***=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/controller/SDNYMainProcessController.java | 2 +- .../main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index cb1841b0..ef1feb75 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -207,7 +207,7 @@ public class SDNYMainProcessController extends AbstractController { if (!checkInvoiceResult.containsKey("code")) { - if (checkInvoiceResult.containsKey("cyjg")) { + if (checkInvoiceResult.containsKey("cyjg") && !"0001".equals(checkInvoiceResult.getString("cyjg"))) { R data = new R(); data = errorInfo(checkInvoiceResult, data); return ResponseEntity.ok(JSONObject.toJSONString(data)); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java index 705fc9db..47241529 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java @@ -810,6 +810,7 @@ public class GatherServiceImpl extends MpBaseServiceImpl Date: Mon, 8 May 2023 10:26:03 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=8B=89=E5=8F=96=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C=E8=B4=A6=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExtInvoicePoolController.java | 18 ++++++++++++++++++ 1 file changed, 18 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..1b63f980 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 @@ -273,6 +273,14 @@ public class ExtInvoicePoolController extends AbstractController { pullRecordReq.setOrgCode(collect); pullRecordReq.setCompanyCode(""); } + if(pullRecordReq.getAccountPeriod()!=null && pullRecordReq.getAccountPeriod()!=""){ + String accountPeriod = pullRecordReq.getAccountPeriod(); + String[] split = accountPeriod.split("-"); + if(split[1].startsWith("0")){ + String replace = split[1].replace("0", ""); + pullRecordReq.setAccountPeriod(split[0]+"-"+replace); + } + } return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq))); }catch (Exception e){ e.printStackTrace(); @@ -282,4 +290,14 @@ public class ExtInvoicePoolController extends AbstractController { } } + + + public static void main(String[] args) { + String str ="2022-04"; + String[] split = str.split("-"); + if(split[1].startsWith("0")){ + String replace = split[1].replace("0", ""); + System.out.println(replace); + } + } } From 37382666ab9915f394989c5e6644f32ca2cbe77b Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 8 May 2023 10:26:03 +0800 Subject: [PATCH 05/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=85=8D?= =?UTF-8?q?=E7=A8=8E=E7=A8=8E=E9=A2=9D=E4=B8=BA***=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java index 47241529..c7a2f854 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java @@ -810,7 +810,7 @@ public class GatherServiceImpl extends MpBaseServiceImpl Date: Mon, 8 May 2023 10:35:06 +0800 Subject: [PATCH 06/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=85=8D?= =?UTF-8?q?=E7=A8=8E=E7=A8=8E=E9=A2=9D=E4=B8=BA***=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java index c7a2f854..62ce4fd5 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/GatherServiceImpl.java @@ -810,7 +810,7 @@ public class GatherServiceImpl extends MpBaseServiceImpl Date: Mon, 8 May 2023 10:43:40 +0800 Subject: [PATCH 07/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=85=8D?= =?UTF-8?q?=E7=A8=8E=E7=A8=8E=E9=A2=9D=E4=B8=BA***=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/impl/SignSaveInvoiceInfoServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index f1e19343..ecc4ed3b 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -449,8 +449,12 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl Date: Mon, 8 May 2023 16:57:41 +0800 Subject: [PATCH 08/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E6=95=B0=E6=8D=AE=E6=97=A0=E7=A8=8E=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvoiceCheckVehicleDetailModel.java | 2 + .../dxhy/core/job/pojo/InvoiceDetailInfo.java | 1 + .../service/impl/CheckTaskServiceImpl.java | 94 +++++++++++++++++++ .../controller/SDNYMainProcessController.java | 33 +++++++ .../impl/SignSaveInvoiceInfoServiceImpl.java | 36 +++++++ 5 files changed, 166 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java b/dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java index 82c2ad86..18a0fd96 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/entity/InvoiceCheckVehicleDetailModel.java @@ -128,6 +128,8 @@ public class InvoiceCheckVehicleDetailModel { */ private String taxRate; + private String taxCode; + /** * This field was generated by MyBatis Generator. This field corresponds to the database column * t_dx_check_vehicle_sale_invoice.tax_bureau_name diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java index eb50a46f..7102e569 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/InvoiceDetailInfo.java @@ -41,6 +41,7 @@ public class InvoiceDetailInfo extends BasePojo { private String detailAmount; private String taxRate; + private String taxCode; private String taxAmount; diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java index 1a1d055d..f652b37a 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java @@ -403,6 +403,10 @@ public class CheckTaskServiceImpl implements CheckTaskService { invoiceDetailInfo.setTxrqz(invoiceDetail.getTxrqz()); // 税率 invoiceDetailInfo.setTaxRate(invoiceDetail.getTaxRate()); + //山能项目 增加税码字段 + if(invoiceDetail.getTaxRate() != null){ + invoiceDetailInfo.setTaxCode(getZSM(invoiceDetail.getTaxRate())); + } // 单位 invoiceDetailInfo.setUnit(invoiceDetail.getUnit()); // 金额 @@ -417,6 +421,95 @@ public class CheckTaskServiceImpl implements CheckTaskService { return invoiceDetailInfoList; } + private String getZSM(String taxRate) { + + String sm = ""; + + switch (taxRate) { + // 发票采集 + case "0": + sm = "J0"; + break; + case "0.00": + sm = "J0"; + break; + case "0.000": + sm = "J0"; + break; + case "免税": + sm = "J0"; + break; + case "0.16": + sm = "J1"; + break; + case "0.13": + sm = "J2"; + break; + case "0.10": + sm = "J3"; + break; + case "0.09": + sm = "J4"; + break; + case "0.06": + sm = "J5"; + break; + case "0.05": + sm = "J6"; + break; + case "0.03": + sm = "J7"; + break; + case "0.02": + sm = "J8"; + break; + case "0.01": + sm = "J9"; + break; + case "0.17": + sm = "JC"; + break; + case "16": + sm = "J1"; + break; + case "13": + sm = "J2"; + break; + case "10": + sm = "J3"; + break; + case "9": + sm = "J4"; + break; + case "6": + sm = "J5"; + break; + case "5": + sm = "J6"; + break; + case "3": + sm = "J7"; + break; + case "2": + sm = "J8"; + break; + case "1.5": + sm = "JA"; + break; + case "1": + sm = "J9"; + break; + case "17": + sm = "JC"; + break; + default: + sm = ""; + break; + + } + return sm; + } + /** * 构建统计实体集 * @@ -627,6 +720,7 @@ public class CheckTaskServiceImpl implements CheckTaskService { invoiceCheckVehicleDetailModel.setEngineNo(responseInvoice.getEngineNo()); invoiceCheckVehicleDetailModel.setVehicleNo(responseInvoice.getVehicleNo()); invoiceCheckVehicleDetailModel.setTaxRate(responseInvoice.getTaxRate()); + invoiceCheckVehicleDetailModel.setTaxCode(getZSM(responseInvoice.getTaxRate())); invoiceCheckVehicleDetailModel.setTaxBureauName(responseInvoice.getTaxBureauName()); invoiceCheckVehicleDetailModel.setTaxBureauCode(responseInvoice.getTaxBureauCode()); invoiceCheckVehicleDetailModel.setTaxRecords(responseInvoice.getTaxRecords()); diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index ef1feb75..ca6262a7 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -1000,6 +1000,39 @@ public class SDNYMainProcessController extends AbstractController { case "0.17": sm = "JC"; break; + case "16": + sm = "J1"; + break; + case "13": + sm = "J2"; + break; + case "10": + sm = "J3"; + break; + case "9": + sm = "J4"; + break; + case "6": + sm = "J5"; + break; + case "5": + sm = "J6"; + break; + case "3": + sm = "J7"; + break; + case "2": + sm = "J8"; + break; + case "1.5": + sm = "JA"; + break; + case "1": + sm = "J9"; + break; + case "17": + sm = "JC"; + break; default: sm = ""; break; diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index ecc4ed3b..e04faabf 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -378,6 +378,42 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl Date: Mon, 8 May 2023 17:08:47 +0800 Subject: [PATCH 09/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E8=AE=A4=E8=AF=81=E6=97=A5=E6=8A=A5=E7=A9=BA=E6=8C=87?= =?UTF-8?q?=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseTDxTaxCurrentServiceImpl.java | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java index 249887eb..b5fc2b2e 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxtaxcurrent/BaseTDxTaxCurrentServiceImpl.java @@ -74,15 +74,25 @@ public class BaseTDxTaxCurrentServiceImpl extends MpBaseServiceImpl Date: Mon, 8 May 2023 17:26:16 +0800 Subject: [PATCH 10/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E6=98=8E=E7=BB=86=E4=B8=AD=E6=97=A0=E7=A8=8E=E7=A0=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CheckTaskServiceImpl.java | 3 + .../InvoiceDetailServiceImpl.java | 60 +++++++++++++++---- .../controller/SDNYMainProcessController.java | 3 + 3 files changed, 55 insertions(+), 11 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java index f652b37a..20fa1828 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java @@ -430,6 +430,9 @@ public class CheckTaskServiceImpl implements CheckTaskService { case "0": sm = "J0"; break; + case "不征税": + sm = "J0"; + break; case "0.00": sm = "J0"; break; diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java index 392994b2..f44518fc 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/invoicedetail/InvoiceDetailServiceImpl.java @@ -622,34 +622,73 @@ public class InvoiceDetailServiceImpl extends MpBaseServiceImpl Date: Mon, 8 May 2023 21:18:00 +0800 Subject: [PATCH 11/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E6=8E=A8?= =?UTF-8?q?=E9=80=81SAP=E6=8A=A5=E9=94=99=E6=97=B6=E6=97=A0=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/controller/SDNYMainProcessController.java | 1 + pom.xml | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java index a8e79c99..75e18987 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java @@ -588,6 +588,7 @@ public class SDNYMainProcessController extends AbstractController { } } } catch (Exception exception) { + log.error("同步SAP失败,报错信息为:{}",exception); exception.printStackTrace(); } return ResponseEntity.ok(JSONObject.toJSONString(R.error(CommonConstants.MSG_ERR_PUSH_SDNY))); diff --git a/pom.xml b/pom.xml index 8bfe4ada..1886e621 100644 --- a/pom.xml +++ b/pom.xml @@ -187,10 +187,7 @@ test /home/dxhy/logs/ - - - true - + @@ -223,6 +220,10 @@ std /home/dxhy/logs/ + + + true + From 26ff8d3a6f81ef22bd3a78c20a04406af5f3beea Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 8 May 2023 21:23:15 +0800 Subject: [PATCH 12/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E6=97=B6=E9=97=B4=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/service/SNPushCheckRecordService.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 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 19aacbd8..f36ee8d6 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 @@ -779,14 +779,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { InvoiceInfo invoice = new InvoiceInfo(); invoice.setInvoiceTypeCode(snInvoice.getInvoiceType()); - Date date = new Date(); - SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd"); - try { - date = ft.parse(snInvoice.getBillingDate()); - } catch (ParseException e) { - e.printStackTrace(); + if(snInvoice.getBillingDate() != null) { + Date date = new Date(); + SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd"); + try { + date = ft.parse(snInvoice.getBillingDate()); + } catch (ParseException e) { + e.printStackTrace(); + } + invoice.setInvoiceDate(date); + }else{ + log.error("开票日期为空"); } - invoice.setInvoiceDate(date); invoice.setIdentityNumber(snInvoice.getIdcardNo()); invoice.setPassenger(snInvoice.getRiderName()); From 77f554bc30617319b1e2ca6686004aebf0b05924 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 9 May 2023 09:23:41 +0800 Subject: [PATCH 13/15] =?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 --- .../com/dxhy/admin/sys/service/impl/LoginServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java index f5c53f41..27bbbcd5 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java @@ -173,7 +173,9 @@ public class LoginServiceImpl implements LoginService { List orgs = new ArrayList<>(); if (sysCompanyEntities != null && sysCompanyEntities.size() > 0){ for (SysCompanyEntity sysCompanyEntity : sysCompanyEntities) { - orgs.add(sysCompanyEntity.getCompanyCode()); + if (sysCompanyEntity != null){ + orgs.add(sysCompanyEntity.getCompanyCode()); + } } } log.info("封装的组织机构编码{}",orgs); From 5dafffca9486f8aaaec63551dc8b1700e0898d93 Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 9 May 2023 21:55:20 +0800 Subject: [PATCH 14/15] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E8=AE=B0=E5=BD=95=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/controller/ExtInvoicePoolController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 1b63f980..18177435 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 @@ -12,6 +12,7 @@ import com.dxhy.auth.client.annotation.IgnoreClientToken; import com.dxhy.auth.client.annotation.IgnoreUserToken; import com.dxhy.common.vo.TaxOrgCode; import com.dxhy.extend.entity.PullRecordReq; +import org.apache.commons.lang3.StringUtils; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -275,10 +276,12 @@ public class ExtInvoicePoolController extends AbstractController { } if(pullRecordReq.getAccountPeriod()!=null && pullRecordReq.getAccountPeriod()!=""){ String accountPeriod = pullRecordReq.getAccountPeriod(); - String[] split = accountPeriod.split("-"); - if(split[1].startsWith("0")){ - String replace = split[1].replace("0", ""); - pullRecordReq.setAccountPeriod(split[0]+"-"+replace); + if(accountPeriod != null && StringUtils.isNoneBlank(accountPeriod) && accountPeriod.contains("-")) { + String[] split = accountPeriod.split("-"); + if (split[1].startsWith("0")) { + String replace = split[1].replace("0", ""); + pullRecordReq.setAccountPeriod(split[0] + "-" + replace); + } } } return ResponseEntity.ok(R.ok().put("data",extInvoicePoolService.selectPullRecord(pullRecordReq))); From 6ddf899f17d83c7b99796f84f2bd0e6993c76c41 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Wed, 10 May 2023 09:48:54 +0800 Subject: [PATCH 15/15] =?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