From f5bf13f3c9a50f818d629275f0db843579c97553 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 29 Mar 2024 16:28:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A4=E6=AC=BE?= =?UTF-8?q?=E8=B5=84=E9=87=91=E5=8D=A0=E7=94=A8=E8=B4=B9=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E8=AE=A1=E6=8F=90=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentPlanDetailsService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java index 2ce532489a..58c86fae43 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java @@ -224,14 +224,14 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService deptVo = sysOrganizationFeign.selectChildrenListBySid(planDetails.getUseOrgSid()).getData(); if (!deptVo.isEmpty()) { - deptVo.stream().forEach(d -> { + for (SysOrganizationVo d : deptVo) { if (d.getName().equals("金融服务部")) { voucherDetail1.setDeptCode(d.getOrgCode()); } - }); + } } voucherDetails.add(voucherDetail1); - BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(v.getBusVinSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData(); if (null != busSalesOrderVehicle) { BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(busSalesOrderVehicle.getSalesOrderSid()).getData(); String deptSid = salesOrder.getOrgSid(); From a494cf15107b20a9055a2f18291a1fda915ce24c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 29 Mar 2024 18:12:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A8=E9=80=81=E4=BC=81=E4=B8=9A=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDistributorService.java | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index 044477e653..6dda30491a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java @@ -522,18 +522,27 @@ public class BaseDistributorService extends MybatisBaseService 0) { //-------------- 推送维护企业开票信息 ------------------------ if (StringUtils.isNotBlank(dto.getRegistNum())) { - FinCompanyInvoicingDetailsVo invoicing = finCompanyInvoicingFeign.selectInvoingByTaxpayerNo(dto.getRegistNum()).getData(); + FinCompanyInvoicingDetailsVo invoicing = finCompanyInvoicingFeign.selByTaxpayerNoAndUseOrgSid(dto.getRegistNum(),dto.getUseOrg()).getData(); FinCompanyInvoicingDto invoicingDto = new FinCompanyInvoicingDto(); - invoicingDto.setAddress(dto.getRegistDetailAddress()); - invoicingDto.setTaxpayerNo(dto.getRegistNum()); - invoicingDto.setName(dto.getDisName()); + if (StringUtils.isNotBlank(dto.getRegistDetailAddress())) { + invoicingDto.setAddress(dto.getRegistDetailAddress()); + } + if (StringUtils.isNotBlank(dto.getRegistNum())) { + invoicingDto.setTaxpayerNo(dto.getRegistNum()); + } + if (StringUtils.isNotBlank(dto.getDisName())) { + invoicingDto.setName(dto.getDisName()); + } if (null != invoicing) { invoicingDto.setSid(invoicing.getSid()); + invoicingDto.setUseOrgSid(invoicing.getUseOrgSid()); } else { invoicingDto.setCreateBySid(dto.getUserSid()); invoicingDto.setOrgSidPath(dto.getOrgSidPath()); invoicingDto.setUseOrgName(dto.getUseOrgName()); invoicingDto.setUseOrgSid(dto.getUseOrg()); + invoicingDto.setOpenTickTypeKey("01"); + invoicingDto.setOpenTickTypeValue("机动车销售统一发票"); } finCompanyInvoicingFeign.qySaveOrUpdate(invoicingDto); }