From eec2ad54218c8fe847e76bc61649c0d29c4bd714 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 27 Nov 2023 15:15:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=AE=A2=E6=88=B7=E5=A4=87?= =?UTF-8?q?=E6=A1=88=E6=9B=B4=E6=96=B0=E5=85=AC=E5=8F=B8=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8F=B7=E5=8F=96=E5=90=8E=E5=85=AB=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E6=9D=83=E8=AF=81=E8=B5=84=E6=96=99=E5=8E=BB=E5=90=8E?= =?UTF-8?q?=E5=85=AB=E4=BD=8D=E8=BD=A6=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bushandover/BusHandoverService.java | 8 ++- .../FinCompanyInvoicingFeign.java | 14 ++-- .../FinCompanyInvoicingFeignFallback.java | 5 ++ .../FinCompanyInvoicingMapper.java | 2 + .../FinCompanyInvoicingMapper.xml | 21 ++++++ .../FinCompanyInvoicingRest.java | 5 ++ .../FinCompanyInvoicingService.java | 6 ++ .../LoanCustomerRecordService.java | 8 ++- .../LoanRepaymentScheduleService.java | 64 ++++++++++++++++--- 9 files changed, 116 insertions(+), 17 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java index ae38d00b95..f7b83d1e21 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java @@ -2238,7 +2238,13 @@ public class BusHandoverService extends MybatisBaseService 8) { + String substringLinkNo = linkNo.substring(linkNo.length() - 8); + mortagageDto.setVinNo(substringLinkNo); + } else { + mortagageDto.setVinNo(linkNo); + } } if (StringUtils.isNotBlank(busSalesOrderVehicle.getSid())) { mortagageDto.setBusVinSid(busSalesOrderVehicle.getSid()); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java index 5cc2464a88..8b7ca817d9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java @@ -100,6 +100,12 @@ public interface FinCompanyInvoicingFeign { @ResponseBody ResultBean selectInvoingByTaxpayerNo(@RequestParam("taxpayerNo") String taxpayerNo); + @ApiOperation("根据纳税人识别号以及组织sid查询开票信息") + @GetMapping("/selByTaxpayerNoAndUseOrgSid") + @ResponseBody + ResultBean selByTaxpayerNoAndUseOrgSid(@RequestParam("taxpayerNo") String taxpayerNo, @RequestParam("useOrgSid") String useOrgSid); + + @ApiOperation("根据组织全路径查询开票信息") @GetMapping("/selectInvoingByOrgPath") @ResponseBody @@ -134,7 +140,7 @@ public interface FinCompanyInvoicingFeign { @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息") @PostMapping("/qySelByUseOrgSid3") @ResponseBody - List qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid,@RequestParam("invoiceKey") String invoiceKey); + List qySelByUseOrgSid3(@RequestParam("orgSid") String orgSid, @RequestParam("invoiceKey") String invoiceKey); @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息") @PostMapping("/qyAppSelByUseOrgSid") @@ -144,7 +150,7 @@ public interface FinCompanyInvoicingFeign { @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息") @PostMapping("/qyAppSelByUseOrgSidTwo") @ResponseBody - List qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search,@RequestParam(value = "invoiceKey",required = false)String invoiceKey); + List qyAppSelByUseOrgSidTwo(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam(value = "invoiceKey", required = false) String invoiceKey); @ApiOperation("企业开票信息管理移动端维护初始化") @GetMapping("/qyAppFetchDetailsBySid/{sid}") @@ -159,10 +165,10 @@ public interface FinCompanyInvoicingFeign { @ApiOperation("企业开票信息管理根据分公司sid查询不带采购系统的开票信息") @PostMapping("/qySelByUseOrgSid2") @ResponseBody - List qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("invoiceKey") String invoiceKey); + List qySelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("invoiceKey") String invoiceKey); @ApiOperation("企业开票信息管理移动端根据分公司sid查询不带采购系统的开票信息") @PostMapping("/qyAppSelByUseOrgSid2") @ResponseBody - List qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid,@RequestParam("search") String search,@RequestParam("invoiceKey") String invoiceKey); + List qyAppSelByUseOrgSid2(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("search") String search, @RequestParam("invoiceKey") String invoiceKey); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java index d5879dbef7..c0610cc2ef 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java @@ -95,6 +95,11 @@ public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeig return null; } + @Override + public ResultBean selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) { + return null; + } + @Override public ResultBean> selectInvoingByOrgPath(String orgPath) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java index 17ff9d11bc..6dc5097318 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java @@ -83,4 +83,6 @@ public interface FinCompanyInvoicingMapper extends BaseMapper selectInvoingByOrgPath(String userOrgSid); + + FinCompanyInvoicingDetailsVo selByTaxpayerNoAndUseOrgSid(@Param("taxpayerNo") String taxpayerNo, @Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml index 6201cf46af..837c34bffc 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml @@ -97,6 +97,27 @@ where taxpayerNo = #{taxpayerNo} and isDelete = 0 + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java index 16661224a0..3cb755d122 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java @@ -122,6 +122,11 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign { return finCompanyInvoicingService.selectInvoingByTaxpayerNo(taxpayerNo); } + @Override + public ResultBean selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) { + return finCompanyInvoicingService.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid); + } + @Override public ResultBean> selectInvoingByOrgPath(String orgPath) { return finCompanyInvoicingService.selectInvoingByOrgPath(orgPath); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java index a1edf840e6..9676062e63 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java @@ -557,4 +557,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw); return finCompanyInvoicingBillListVos; } + + public ResultBean selByTaxpayerNoAndUseOrgSid(String taxpayerNo, String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + FinCompanyInvoicingDetailsVo vo = baseMapper.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java index ea40e3e5a1..6aa5071fe1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancustomerrecord/LoanCustomerRecordService.java @@ -684,9 +684,11 @@ public class LoanCustomerRecordService extends MybatisBaseService 8) { + vinNo = linkNo.substring(linkNo.length() - 8); + } else { + vinNo = linkNo; + } String busVinSid = vehicle.getSid(); //主方案 for (int i = 0; i < mainPeriod; i++) { @@ -428,7 +432,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 8) { + vinNo = linkNo.substring(linkNo.length() - 8); + } else { + vinNo = linkNo; + } String busVinSid = vehicle.getSid(); //主方案 for (int i = 0; i < mainPeriod; i++) { @@ -582,7 +592,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList()); if (!stringVinNos.isEmpty()) { - entity.setVinNo(String.join(",", stringVinNos)); + List vinList = new ArrayList<>(); + for (String linkNo : stringVinNos) { + String vinNo = ""; + if (linkNo.length() > 8) { + vinNo = linkNo.substring(linkNo.length() - 8); + + } else { + vinNo = linkNo; + } + vinList.add(vinNo); + } + entity.setVinNo(String.join(",", vinList)); } } BusSalesOrderLoancontractDetailsVo loancontractVo = busSalesOrderLoancontractFeign.fetchDetailsBySid(dto.getSalesOrderSid()).getData(); @@ -751,6 +772,12 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 8) { + vinNo = linkNo.substring(linkNo.length() - 8); + } else { + vinNo = linkNo; + } String busVinSid = vehicle.getSid(); //主方案 for (int i = 0; i < mainPeriod; i++) { @@ -774,7 +801,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService 8) { + vinNo = linkNo.substring(linkNo.length() - 8); + } else { + vinNo = linkNo; + } String busVinSid = vehicle.getSid(); //主方案 for (int i = 0; i < mainPeriod; i++) { @@ -927,7 +960,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService stringVinNos = busSalesOrderVehicles.stream().map(c -> c.getLinkNo()).collect(Collectors.toList()); if (!stringVinNos.isEmpty()) { - vo.setVinNo(String.join(",", stringVinNos)); + List vinList = new ArrayList<>(); + for (String linkNo : stringVinNos) { + String vinNo = ""; + if (linkNo.length() > 8) { + vinNo = linkNo.substring(linkNo.length() - 8); + + } else { + vinNo = linkNo; + } + vinList.add(vinNo); + } + vo.setVinNo(String.join(",", vinList)); } } }