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 1/4] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=A4=87=E6=A1=88=E6=9B=B4=E6=96=B0=E5=85=AC=E5=8F=B8=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E4=BF=A1=E6=81=AF=E3=80=81=E8=BF=98=E6=AC=BE=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=BD=A6=E6=9E=B6=E5=8F=B7=E5=8F=96=E5=90=8E=E5=85=AB?= =?UTF-8?q?=E4=BD=8D=E3=80=81=E6=9D=83=E8=AF=81=E8=B5=84=E6=96=99=E5=8E=BB?= =?UTF-8?q?=E5=90=8E=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)); } } } From a8b8cc70a6d0c9db8f5b97f2cdce2809dfde0c5c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 27 Nov 2023 15:31:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 12 ++++++++++++ .../riskcenter/biz/loandiff/LoanDiffService.java | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 80b8467cb5..65c8973b34 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -103,6 +103,8 @@ import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService; import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService; import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService; import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService; +import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; +import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -198,6 +200,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -1831,6 +1835,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Mon, 27 Nov 2023 15:39:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E5=A6=82=E6=9E=9C=E5=80=9F=E6=AC=BE=E4=BA=BA=E4=B8=8D?= =?UTF-8?q?=E6=98=AF=E5=AE=9E=E9=99=85=E8=B4=AD=E8=BD=A6=E4=BA=BA=EF=BC=8C?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=BA=BA=E5=91=98=E4=B8=AD=E5=BF=85=E9=A1=BB?= =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E6=98=AF=E5=AE=9E=E9=99=85=E8=B4=AD?= =?UTF-8?q?=E8=BD=A6=E4=BA=BA=E6=89=8D=E5=8F=AF=E4=BB=A5=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E3=80=82=20=E8=AF=81=E6=98=8E=E6=96=87=E4=BB=B6=EF=BC=9A?= =?UTF-8?q?=E6=8B=85=E4=BF=9D=E4=BA=BA=E8=81=94=E5=8A=A8=E8=80=83=E5=AF=9F?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=9A=84=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E9=99=85=E8=B4=AD=E8=BD=A6=E4=BA=BA=E3=80=82?= =?UTF-8?q?=20=E8=B5=84=E4=BA=A7=E7=B1=BB=E9=99=A4=E4=BA=86=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E5=85=B6=E4=BB=96=E5=BF=85=E5=A1=AB=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=90=8E=E7=BB=AD=E4=B8=8A=E4=BC=A0=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E7=8E=B0=E5=9C=BA=E7=85=A7=E7=89=87=E3=80=82?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E4=B8=8D=E5=AE=8C=E6=95=B4=E7=9A=84=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=BF=9D=E5=AD=98=EF=BC=8C=E4=BD=86=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=80=83=E5=AF=9F=E6=84=8F=E8=A7=81=E7=9A=84?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8C=89=E9=92=AE=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=8F=90=E9=86=92=E9=9C=80=E8=A6=81=E5=85=88=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E8=80=83=E5=AF=9F=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateService.java | 50 ++++++++++++------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index b7b635d407..4aa8dde15a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -398,25 +398,25 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService otherPersonnel = dto.getOtherPersonnel(); + if (!dto.getActualBuyer()) { + Boolean isExistSjgcr = false; + if (otherPersonnel != null && otherPersonnel.size() > 0) { + for (LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto : otherPersonnel) { + if ("3".equals(loanHomeVisitInvestigateSaveOtherPeoDto.getPersonnelKey())) { + isExistSjgcr = true; + break; + } + } + } + if (!isExistSjgcr) { + return rb.setMsg("贷款人和其他人员中必须存在实际购车人"); + } + } List bankCardImages = dto.getBankCardImages(); LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto(); LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(dto.getSid()); @@ -1014,9 +1030,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); - if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){ + if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) { for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : loanHomeVisitInvestigateInitOtherPeoVos) { - if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())){ + if ("1".equals(loanHomeVisitInvestigateInitOtherPeoVo.getPersonnelKey())) { //担保人身份证 List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); List pohkbImage = new ArrayList<>(); @@ -1451,12 +1467,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getToDoNum(RiskToDoNumQuery riskToDoNumQuery) { From d8d96efb20ed9c048ff4d40fd593fdc77ae0eb33 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 27 Nov 2023 16:00:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9D=83=E8=AF=81=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=8F=96=E5=90=8E=E5=85=AB=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanWarrantInformationService.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java index c573cf6309..fda80418bc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java @@ -156,6 +156,16 @@ public class LoanWarrantInformationService extends MybatisBaseService pagging = baseMapper.listPage(page, qw); + List records = pagging.getRecords(); + if (!records.isEmpty()) { + for (LoanWarrantInformationVo record : records) { + if (StringUtils.isNotBlank(record.getVinNo())) { + if (record.getVinNo().length() > 8) { + record.setVinNo(record.getVinNo().substring(record.getVinNo().length() - 8)); + } + } + } + } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } @@ -172,6 +182,11 @@ public class LoanWarrantInformationService extends MybatisBaseService 8) { + vo.setVinNo(loanWarrantInformation.getVinNo().substring(loanWarrantInformation.getVinNo().length() - 8)); + } + } String busVinSid = loanWarrantInformation.getBusVinSid(); //登记证 1-2页 List fileList = loanFileService.selectByLinkSid(busVinSid, LoanFileEnum.REGISTRATION_FILES_ONE.getAttachType()); @@ -276,7 +291,13 @@ public class LoanWarrantInformationService extends MybatisBaseService 8) { + vinNo = entity.getVinNo().substring(entity.getVinNo().length() - 8); + } else { + vinNo = entity.getVinNo(); + } + sbVinNo.append(vinNo).append("，"); } if (StringUtils.isNotBlank(entity.getVehicleMark())) { sbVinMark.append(entity.getVehicleMark()).append("，"); @@ -345,7 +366,7 @@ public class LoanWarrantInformationService extends MybatisBaseService