From 28a47a4288d3309103320999cc4c50ab094b7904 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 28 Dec 2023 14:26:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBeCollectionVehService.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java index 8415424228..469ba2cb8c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java @@ -159,10 +159,7 @@ public class LoanBeCollectionVehService extends MybatisBaseService 0){ for (LoanHomevisitInvestigateFileDetailsVo dbrsfz : dbrsfzs) { LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo(); - String fileUrl = dbrsfz.getFileUrl(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - fileUrl = urlPrefix + fileUrl; - loanBeCollectionFileVo.setUrl(fileUrl); + loanBeCollectionFileVo.setUrl(dbrsfz.getFileUrl()); sfzs.add(loanBeCollectionFileVo); } } @@ -172,10 +169,7 @@ public class LoanBeCollectionVehService extends MybatisBaseService 0){ for (LoanHomevisitInvestigateFileDetailsVo dbxy : dbrdbxys) { LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo(); - String fileUrl = dbxy.getFileUrl(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - fileUrl = urlPrefix + fileUrl; - loanBeCollectionFileVo.setUrl(fileUrl); + loanBeCollectionFileVo.setUrl(dbxy.getFileUrl()); dbxys.add(loanBeCollectionFileVo); } } @@ -185,10 +179,7 @@ public class LoanBeCollectionVehService extends MybatisBaseService 0){ for (LoanHomevisitInvestigateFileDetailsVo qt : dbrqts) { LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo(); - String fileUrl = qt.getFileUrl(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - fileUrl = urlPrefix + fileUrl; - loanBeCollectionFileVo.setUrl(fileUrl); + loanBeCollectionFileVo.setUrl(qt.getFileUrl()); qts.add(loanBeCollectionFileVo); } } From 74782ed1cb58252c25a5fe8c22326bbeb6daa2ed Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 28 Dec 2023 14:44:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8B=85?= =?UTF-8?q?=E4=BF=9D=E4=BA=BA=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91=20=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88=E8=B7=A8?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=20?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B1=95=E7=A4=BA=E6=8B=85=E4=BF=9D=E4=BA=BA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBeCollectionVehDetailsVo.java | 11 ++- .../risk/becollection/AppDbrDetailsVo.java | 21 ++++ .../risk/becollection/BeCollectionFeign.java | 7 +- .../risk/becollection/BeCollectionRest.java | 10 +- .../becollection/BeCollectionService.java | 97 +++++++++++++++++-- 5 files changed, 125 insertions(+), 21 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppDbrDetailsVo.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java index 2ef2b49fc8..8ba4dbecc1 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeCollectionVehDetailsVo.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.api.risk.becollection; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -53,8 +54,10 @@ import java.util.List; @ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情") public class AppBeCollectionVehDetailsVo implements Vo { - private String sid; // sid - + @ApiModelProperty("是否有担保人") + private Boolean showDbr = false; + @ApiModelProperty("销售订单车辆sid") + private String saleVehSid; @ApiModelProperty("贷款合同编号") private String contractId; @ApiModelProperty("车架号") @@ -93,8 +96,8 @@ public class AppBeCollectionVehDetailsVo implements Vo { private String kpglSid; @ApiModelProperty("月还明细sid") private String yhmxSid; - @ApiModelProperty("金融方案sid") - private String jrfaSid; @ApiModelProperty("家访考察sid") private String jfkcSid; + @ApiModelProperty("金融方案详情页面") + private AppLoanHomeVisitVo jrfa; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppDbrDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppDbrDetailsVo.java new file mode 100644 index 0000000000..c016f3d226 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppDbrDetailsVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.risk.becollection; + +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppFinanceForm; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class AppDbrDetailsVo { + + @ApiModelProperty("担保人信息") + private List dbrInfo; + @ApiModelProperty("身份证附件") + private List appsfz = new ArrayList<>(); + @ApiModelProperty("担保协议") + private List appdbxy = new ArrayList<>(); + @ApiModelProperty("其他") + private List appqt = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java index 739930fd4d..f79a930741 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java @@ -1,7 +1,5 @@ package com.yxt.anrui.terminal.api.risk.becollection; - -import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery; import com.yxt.anrui.terminal.api.risk.becollection.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -57,6 +55,11 @@ public interface BeCollectionFeign { @ResponseBody public ResultBean saveCollectionEnter(@RequestBody AppBeCollectionRecordDto dto); + @ApiOperation("查看担保人信息") + @GetMapping("/showDbr") + @ResponseBody + public ResultBean showDbr(@RequestParam("saleVehSid") String saleVehSid); + /****************************************催收流程审批******************************************/ @ApiOperation("办理") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java index ac67c01bc2..cc39516415 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java @@ -27,11 +27,6 @@ package com.yxt.anrui.terminal.biz.risk.becollection; import com.yxt.anrui.terminal.api.risk.becollection.*; import com.yxt.anrui.terminal.api.risk.becollection.flowable.*; -import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*; -import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto; -import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery; -import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealTaskQuery; -import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.SubmitHomeAppealApplyDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -81,6 +76,11 @@ public class BeCollectionRest implements BeCollectionFeign { return beCollectionService.saveCollectionEnter(dto); } + @Override + public ResultBean showDbr(String saleVehSid) { + return beCollectionService.showDbr(saleVehSid); + } + @Override public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) { return beCollectionService.agreeCreditInfo(dto); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java index 1a5a061d75..f6a0e58d1b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java @@ -28,11 +28,8 @@ package com.yxt.anrui.terminal.biz.risk.becollection; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; -import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.ReaRepaymentDto; -import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -43,7 +40,9 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyF import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo; import com.yxt.anrui.riskcenter.api.loanbecollectionapply.flowable.*; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.*; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDbrDetailsVo; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile; import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehFegin; import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehQuery; @@ -54,12 +53,14 @@ import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyF import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereFile; import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.flowable.*; import com.yxt.anrui.riskcenter.api.loanbepadsincereveh.LoanBePadsincereVehDetailsVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; +import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; +import com.yxt.anrui.terminal.api.base.common.CarModelVo; import com.yxt.anrui.terminal.api.risk.becollection.*; import com.yxt.anrui.terminal.api.risk.becollection.flowable.*; -import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.LoanHomeVisitInvestigatePageQuery; -import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.LoanHomeVisitInvestigatePageVo; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppFinanceForm; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; +import com.yxt.anrui.terminal.biz.base.common.CommonService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -82,15 +83,21 @@ public class BeCollectionService { @Autowired private LoanBeOverdueVehFegin loanBeOverdueVehFegin; @Autowired + private LoanSolutionsFeign loanSolutionsFeign; + @Autowired private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; @Autowired private LoanBeCollectionRecordFeign loanBeCollectionRecordFeign; @Autowired + private LoanBeCollectionVehFeign loanBeCollectionVehFeign; + @Autowired private SysUserFeign sysUserFeign; @Autowired private SysStaffOrgFeign sysStaffOrgFeign; @Autowired private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private CommonService commonService; public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -281,6 +288,11 @@ public class BeCollectionService { List appBeCollectionVehDetailsVos = new ArrayList<>(); for (LoanBeCollectionVehDetailsVo loanBeCollectionVehDetail : loanBeCollectionVehDetails) { AppBeCollectionVehDetailsVo appBeCollectionVehDetailsVo = new AppBeCollectionVehDetailsVo(); + appBeCollectionVehDetailsVo.setSaleVehSid(loanBeCollectionVehDetail.getSaleVehSid()); + LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehFeign.initDbr(loanBeCollectionVehDetail.getSaleVehSid()).getData(); + if (StringUtils.isNotBlank(loanBeCollectionVehDbrDetailsVo.getPeoName())){ + appBeCollectionVehDetailsVo.setShowDbr(true); + } appBeCollectionVehDetailsVo.setContractId(loanBeCollectionVehDetail.getLoanContractNo()); appBeCollectionVehDetailsVo.setVin(loanBeCollectionVehDetail.getVinNo()); appBeCollectionVehDetailsVo.setCarNum(loanBeCollectionVehDetail.getCarNum()); @@ -312,12 +324,16 @@ public class BeCollectionService { if ("月还明细".equals(loanBeCollectionVehFile.getName())) { appBeCollectionVehDetailsVo.setYhmxSid(loanBeCollectionVehFile.getSid()); } - if ("金融方案".equals(loanBeCollectionVehFile.getName())) { - appBeCollectionVehDetailsVo.setJrfaSid(loanBeCollectionVehFile.getSid()); - } if ("家访考察报告".equals(loanBeCollectionVehFile.getName())) { appBeCollectionVehDetailsVo.setJfkcSid(loanBeCollectionVehFile.getSid()); } + if ("金融方案".equals(loanBeCollectionVehFile.getName())) { + LoanSolutions loanSolutions = loanSolutionsFeign.fetchBySid(loanBeCollectionVehFile.getSid()).getData(); + CarModelVo finPage1 = commonService.getLoanSolution(loanSolutions.getSalesOrderSid()).getData(); + AppLoanHomeVisitVo finPage2 = new AppLoanHomeVisitVo(); + BeanUtil.copyProperties(finPage1, finPage2); + appBeCollectionVehDetailsVo.setJrfa(finPage2); + } } appBeCollectionVehDetailsVos.add(appBeCollectionVehDetailsVo); } @@ -503,4 +519,65 @@ public class BeCollectionService { loanBeCollectionRecordFeign.save(loanBeCollectionRecordDto); return rb.success(); } + + public ResultBean showDbr(String saleVehSid) { + ResultBean rb = ResultBean.fireFail(); + LoanBeCollectionVehDbrDetailsVo loanBeCollectionVehDbrDetailsVo = loanBeCollectionVehFeign.initDbr(saleVehSid).getData(); + AppDbrDetailsVo appDbrDetailsVo = new AppDbrDetailsVo(); + List dbrInfo = new ArrayList<>(); + AppFinanceForm appFinanceForm2 = new AppFinanceForm(); + appFinanceForm2.setValue("姓名：" + loanBeCollectionVehDbrDetailsVo.getPeoName()); + appFinanceForm2.setSpanSize(2); + dbrInfo.add(appFinanceForm2); + AppFinanceForm appFinanceForm3 = new AppFinanceForm(); + appFinanceForm3.setValue("身份证号码：" + loanBeCollectionVehDbrDetailsVo.getIdNumber()); + appFinanceForm3.setSpanSize(2); + dbrInfo.add(appFinanceForm3); + AppFinanceForm appFinanceForm4 = new AppFinanceForm(); + appFinanceForm4.setValue("电话：" + loanBeCollectionVehDbrDetailsVo.getMobile()); + appFinanceForm4.setSpanSize(2); + dbrInfo.add(appFinanceForm4); + AppFinanceForm appFinanceForm5 = new AppFinanceForm(); + appFinanceForm5.setValue("职业：" + loanBeCollectionVehDbrDetailsVo.getPeoCareerValue()); + appFinanceForm5.setSpanSize(2); + dbrInfo.add(appFinanceForm5); + AppFinanceForm appFinanceForm6 = new AppFinanceForm(); + appFinanceForm6.setValue("现住址：" + loanBeCollectionVehDbrDetailsVo.getPeoPreAddress()); + appFinanceForm6.setSpanSize(2); + dbrInfo.add(appFinanceForm6); + AppFinanceForm appFinanceForm7 = new AppFinanceForm(); + appFinanceForm7.setValue("户籍地址：" + loanBeCollectionVehDbrDetailsVo.getPeoDomAddress()); + appFinanceForm7.setSpanSize(2); + dbrInfo.add(appFinanceForm7); + AppFinanceForm appFinanceForm8 = new AppFinanceForm(); + appFinanceForm8.setValue("工作单位：" + loanBeCollectionVehDbrDetailsVo.getWorkUnit()); + appFinanceForm8.setSpanSize(2); + dbrInfo.add(appFinanceForm8); + appDbrDetailsVo.setDbrInfo(dbrInfo); + List sfzFiles = loanBeCollectionVehDbrDetailsVo.getSfzFiles(); + List appsfz = new ArrayList<>(); + List dbxyFiles = loanBeCollectionVehDbrDetailsVo.getDbxyFiles(); + List appdbxy = new ArrayList<>(); + List qtFiles = loanBeCollectionVehDbrDetailsVo.getQtFiles(); + List appqt = new ArrayList<>(); + if (sfzFiles != null && sfzFiles.size() > 0){ + for (LoanBeCollectionFileVo sfzFile : sfzFiles) { + appsfz.add(sfzFile.getUrl()); + } + } + if (dbxyFiles != null && dbxyFiles.size() > 0){ + for (LoanBeCollectionFileVo dbxyFile : dbxyFiles) { + appdbxy.add(dbxyFile.getUrl()); + } + } + if (qtFiles != null && qtFiles.size() > 0){ + for (LoanBeCollectionFileVo qtFile : qtFiles) { + appqt.add(qtFile.getUrl()); + } + } + appDbrDetailsVo.setAppsfz(appsfz); + appDbrDetailsVo.setAppdbxy(appdbxy); + appDbrDetailsVo.setAppqt(appqt); + return rb.success().setData(appDbrDetailsVo); + } } \ No newline at end of file