From 9a3e73ddee009df58297e925d66cb476efd252ae Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 25 Dec 2023 09:54:14 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/databases/报表中心.sql | 36 ++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/doc/databases/报表中心.sql b/doc/databases/报表中心.sql index c2ec6c3ad6..02cdcd33c9 100644 --- a/doc/databases/报表中心.sql +++ b/doc/databases/报表中心.sql @@ -582,11 +582,11 @@ where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); -- ============================================== -- 欠款出库数量、欠款出库金额万元、金融未放款数量、金融未放款金额（万元） -- 欠款出库数量--截止当日欠款出库申请通过且未回清款的台数 -update daily_report r inner join ( +update daily_report r inner join (select sum(cc.scount) as scount,cc.useOrgSid, cc.vehMConfigSid, cc.vehModelSid from ( select count(bdad.id) as scount, ba.useOrgSid, bm.modelConfigSid as vehMConfigSid, bm.modelSid as vehModelSid from anrui_buscenter.bus_delivered_apply_details bdad left join anrui_buscenter.bus_delivered_apply ba on ba.sid = bdad.applySid - left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.sid + left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.busVinSid left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bdad.busVinSid @@ -594,7 +594,20 @@ update daily_report r inner join ( where ba.nodeState = '已办结' and ba.typeState = 1 group by bdad.busVinSid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid - having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)) s + having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0) + union all + select count(bdad.id) as scount,ba.useOrgSid,bm.modelConfigSid as vehMConfigSid, bm.modelSid as vehModelSid + from anrui_buscenter.bus_arrears_carry_vehicle_details bdad + left join anrui_buscenter.bus_arrears_carry_vehicle_apply ba on ba.sid = bdad.applySid + left join anrui_buscenter.bus_sales_order_vehicle bv on bv.linkSid = bdad.vinSid + left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid + left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid + left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bv.sid + left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid + where ba.nodeState = '已办结' + group by bv.sid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid + having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)) cc + ) s on r.useOrgSid = s.useOrgSid and r.vehModelSid = s.vehModelSid and r.vehMConfigSid = s.vehMConfigSid @@ -603,23 +616,34 @@ where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); -- 欠款出库金融--截止当日欠款出库申请通过且未回清款的台数欠款总额 -update daily_report r inner join ( +update daily_report r inner join (select sum(cc.scount) as scount,cc.useOrgSid, cc.vehMConfigSid, cc.vehModelSid from ( select (sum(fd.reveivableMoney) - sum(fs.subscriptionMoney)) as scount, ba.useOrgSid, bm.modelConfigSid as vehMConfigSid, bm.modelSid as vehModelSid from anrui_buscenter.bus_delivered_apply_details bdad left join anrui_buscenter.bus_delivered_apply ba on ba.sid = bdad.applySid - left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.sid + left join anrui_buscenter.bus_sales_order_vehicle bv on bv.sid = bdad.busVinSid left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid - left join anrui_base.base_vehicle_state bs on bs.busSid = bdad.busVinSid left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bdad.busVinSid left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid where ba.nodeState = '已办结' and ba.typeState = 1 group by bdad.busVinSid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0) + union all + select (sum(fd.reveivableMoney) - sum(fs.subscriptionMoney)) as scount,ba.useOrgSid,bm.modelConfigSid as vehMConfigSid, bm.modelSid as vehModelSid + from anrui_buscenter.bus_arrears_carry_vehicle_details bdad + left join anrui_buscenter.bus_arrears_carry_vehicle_apply ba on ba.sid = bdad.applySid + left join anrui_buscenter.bus_sales_order_vehicle bv on bv.linkSid = bdad.vinSid + left join anrui_buscenter.bus_sales_order bo on bo.sid = bv.salesOrderSid + left join anrui_buscenter.bus_sales_order_model bm on bm.salesOrderSid = bo.sid + left join anrui_fin.fin_uncollected_receivables_detailed fd on fd.busVinSid = bv.sid + left join anrui_fin.fin_selected_receivables_detailed fs on fs.receivablesSid = fd.sid + where ba.nodeState = '已办结' + group by bv.sid, ba.useOrgSid, bm.modelSid, bm.modelConfigSid + having sum(fd.reveivableMoney) > ifnull(sum(fs.subscriptionMoney), 0)) cc ) s on r.useOrgSid = s.useOrgSid and r.vehModelSid = s.vehModelSid From 52aec9d65ac1f850a4a657378c2094629e20d7f7 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 25 Dec 2023 10:37:26 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=9E=AB=E6=AC=BE=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=94=80=E5=94=AE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=BD=A6=E8=BE=86sid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBePadsincereVeh.java | 2 + .../LoanBePadsincereVehDetailsVo.java | 2 + .../LoanBePadsincereVehDto.java | 2 + .../LoanRepaymentScheduleDetailsVo.java | 2 + .../LoanBePadsincereApplyService.java | 47 +++++++++---------- .../LoanBePadsincereVehService.java | 1 + .../LoanRepaymentScheduleMapper.xml | 17 ++++--- 7 files changed, 41 insertions(+), 32 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVeh.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVeh.java index c136b37e65..cacaad44f1 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVeh.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVeh.java @@ -80,6 +80,8 @@ public class LoanBePadsincereVeh extends BaseEntity { private String bankCollectionAcc; // 资方收款账户 @ApiModelProperty("资方收款账号") private String bankCollectionNum; // 资方收款账号 + @ApiModelProperty("销售订单车辆sid") + private String saleVehSid; @ApiModelProperty("垫款申请sid") private String mainSid; // 垫款申请sid diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java index bd7359f7c2..84d4179956 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDetailsVo.java @@ -79,6 +79,8 @@ public class LoanBePadsincereVehDetailsVo implements Vo { private String bankCollectionAcc; // 资方收款账户 @ApiModelProperty("资方收款账号") private String bankCollectionNum; // 资方收款账号 + @ApiModelProperty("销售订单车辆sid") + private String busVinSid; @ApiModelProperty("垫款申请sid") private String mainSid; // 垫款申请sid diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java index bd988314e5..64dec15010 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereveh/LoanBePadsincereVehDto.java @@ -79,6 +79,8 @@ public class LoanBePadsincereVehDto implements Dto { private String bankCollectionAcc; // 资方收款账户 @ApiModelProperty("资方收款账号") private String bankCollectionNum; // 资方收款账号 + @ApiModelProperty("销售订单车辆sid") + private String busVinSid; @ApiModelProperty("垫款申请sid") private String mainSid; // 垫款申请sid diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleDetailsVo.java index 5f09ff1f7e..fcbded26ad 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleDetailsVo.java @@ -16,4 +16,6 @@ public class LoanRepaymentScheduleDetailsVo { private String borrowerName; @ApiModelProperty("销售订单sid") private String salesOrderSid; + @ApiModelProperty("销售订单车辆sid") + private String busVinSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java index 6cb44c0f7c..a733a91329 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java @@ -343,9 +343,9 @@ public class LoanBePadsincereApplyService extends MybatisBaseService loanBePadsincereVehDetailsVos = loanBePadsincereVehService.selByMainSid(sid); vo.setLoanBePadsincereVehList(loanBePadsincereVehDetailsVos); - List loanFiles = loanFileService.selectByLinkSid(sid,LoanFileEnum.BEPADSINCERE.getAttachType()); + List loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.BEPADSINCERE.getAttachType()); List loanBePadsincereFiles = new ArrayList<>(); - if (loanFiles != null && loanFiles.size() > 0){ + if (loanFiles != null && loanFiles.size() > 0) { for (LoanFile loanFile : loanFiles) { LoanBePadsincereFile loanBePadsincereFile = new LoanBePadsincereFile(); String filePath = loanFile.getFilePath(); @@ -391,29 +391,26 @@ public class LoanBePadsincereApplyService extends MybatisBaseService loanRepaymentScheduleDetailsVos = loanRepaymentScheduleService.selectByBankContractNo(bePadsincereExcelInfo.getBankContractNo()); for (LoanRepaymentScheduleDetailsVo loanRepaymentScheduleDetailsVo : loanRepaymentScheduleDetailsVos) { - String vinNo = loanRepaymentScheduleDetailsVo.getVinNo(); - String[] vinNos = vinNo.split(","); - for (String no : vinNos) { - LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo = new LoanBePadsincereVehDetailsVo(); - loanBePadsincereVehDetailsVo.setVinNo(no); - loanBePadsincereVehDetailsVo.setLoanContractNo(loanRepaymentScheduleDetailsVo.getLoanContractNo()); - loanBePadsincereVehDetailsVo.setBankName(loanRepaymentScheduleDetailsVo.getBankName()); - loanBePadsincereVehDetailsVo.setBankContractNo(bePadsincereExcelInfo.getBankContractNo()); - BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanRepaymentScheduleDetailsVo.getSalesOrderSid()).getData(); - loanBePadsincereVehDetailsVo.setCustomerName(busSalesOrder.getCustomerName()); - loanBePadsincereVehDetailsVo.setBorrowerName(loanRepaymentScheduleDetailsVo.getBorrowerName()); - loanBePadsincereVehDetailsVo.setPeriod(bePadsincereExcelInfo.getPeriod()); - String sysBeMoney = loanRepaymentPlanDetailsService.selBeMoney(no, bePadsincereExcelInfo.getPeriod(), bePadsincereExcelInfo.getBankContractNo()); - loanBePadsincereVehDetailsVo.setSysBeMoney(sysBeMoney); - loanBePadsincereVehDetailsVo.setBankBeMoney(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBePrincipal()) / vinNos.length)); - loanBePadsincereVehDetailsVo.setBankBeInter(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBeDefInter()) / vinNos.length)); - loanBePadsincereVehDetailsVo.setPadMoney(String.valueOf(Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeMoney()) + Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeInter()))); - loanBePadsincereVehDetailsVo.setPaymentAccount(bePadsincereExcelInfo.getPaymentAccount()); - loanBePadsincereVehDetailsVo.setPaymentNum(bePadsincereExcelInfo.getPaymentNum()); - loanBePadsincereVehDetailsVo.setBankCollectionAcc(bePadsincereExcelInfo.getBankCollectionAcc()); - loanBePadsincereVehDetailsVo.setBankCollectionNum(bePadsincereExcelInfo.getBankCollectionNum()); - resultList2.add(loanBePadsincereVehDetailsVo); - } + LoanBePadsincereVehDetailsVo loanBePadsincereVehDetailsVo = new LoanBePadsincereVehDetailsVo(); + loanBePadsincereVehDetailsVo.setVinNo(loanRepaymentScheduleDetailsVo.getVinNo()); + loanBePadsincereVehDetailsVo.setLoanContractNo(loanRepaymentScheduleDetailsVo.getLoanContractNo()); + loanBePadsincereVehDetailsVo.setBankName(loanRepaymentScheduleDetailsVo.getBankName()); + loanBePadsincereVehDetailsVo.setBankContractNo(bePadsincereExcelInfo.getBankContractNo()); + BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanRepaymentScheduleDetailsVo.getSalesOrderSid()).getData(); + loanBePadsincereVehDetailsVo.setCustomerName(busSalesOrder.getCustomerName()); + loanBePadsincereVehDetailsVo.setBorrowerName(loanRepaymentScheduleDetailsVo.getBorrowerName()); + loanBePadsincereVehDetailsVo.setPeriod(bePadsincereExcelInfo.getPeriod()); + String sysBeMoney = loanRepaymentPlanDetailsService.selBeMoney(loanRepaymentScheduleDetailsVo.getVinNo(), bePadsincereExcelInfo.getPeriod(), bePadsincereExcelInfo.getBankContractNo()); + loanBePadsincereVehDetailsVo.setSysBeMoney(sysBeMoney); + loanBePadsincereVehDetailsVo.setBankBeMoney(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBePrincipal()) / loanRepaymentScheduleDetailsVos.size())); + loanBePadsincereVehDetailsVo.setBankBeInter(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBeDefInter()) / loanRepaymentScheduleDetailsVos.size())); + loanBePadsincereVehDetailsVo.setPadMoney(String.valueOf(Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeMoney()) + Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeInter()))); + loanBePadsincereVehDetailsVo.setPaymentAccount(bePadsincereExcelInfo.getPaymentAccount()); + loanBePadsincereVehDetailsVo.setPaymentNum(bePadsincereExcelInfo.getPaymentNum()); + loanBePadsincereVehDetailsVo.setBankCollectionAcc(bePadsincereExcelInfo.getBankCollectionAcc()); + loanBePadsincereVehDetailsVo.setBankCollectionNum(bePadsincereExcelInfo.getBankCollectionNum()); + loanBePadsincereVehDetailsVo.setBusVinSid(loanRepaymentScheduleDetailsVo.getBusVinSid()); + resultList2.add(loanBePadsincereVehDetailsVo); } } if (StringUtils.isNotBlank(importReturn.getCheckInfo())) { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java index 3a37966934..3839715935 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereveh/LoanBePadsincereVehService.java @@ -84,6 +84,7 @@ public class LoanBePadsincereVehService extends MybatisBaseService - SELECT loanContractNo, - vinNo, - bankName, - borrowerName, - salesOrderSid - FROM loan_repayment_schedule - WHERE bankContractNo = #{bankContractNo} + SELECT DISTINCT lrs.loanContractNo, + lrpd.vinNo, + lrs.bankName, + lrs.borrowerName, + lrs.salesOrderSid, + lrpd.busVinSid + FROM loan_repayment_schedule lrs + LEFT JOIN loan_repayment_plan_details lrpd + ON lrpd.scheduleSid = lrs.sid + WHERE lrs.bankContractNo = #{bankContractNo} \ No newline at end of file From fd4bd88a54eed86e9e2e4e7db522c6e62ca65155 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 25 Dec 2023 11:57:23 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E8=BF=98=E6=AC=BE=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderVehicle.java | 4 + .../BusSalesOrderVehicleFeign.java | 4 + .../BusSalesOrderVehicleFeignFallback.java | 5 + .../bussalesordervehicle/ReaRepaymentDto.java | 23 ++ .../BusSalesOrderVehicleMapper.java | 3 + .../BusSalesOrderVehicleRest.java | 7 + .../BusSalesOrderVehicleService.java | 4 + .../LoanBeOverdueVehFegin.java | 4 + .../api/loanbeoverdueveh/ReaRepaymentVo.java | 25 ++ .../LoanBeOverdueVehMapper.java | 3 + .../LoanBeOverdueVehMapper.xml | 218 ++++++++++-------- .../LoanBeOverdueVehRest.java | 12 +- .../LoanBeOverdueVehService.java | 13 +- 13 files changed, 216 insertions(+), 109 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/ReaRepaymentDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/ReaRepaymentVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java index c781825fbe..28d701d283 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java @@ -79,4 +79,8 @@ public class BusSalesOrderVehicle extends BaseEntity { private String riskStaffUserSid; @ApiModelProperty("风控专员用户姓名") private String riskStaffUserName; + @ApiModelProperty("实际还款人姓名") + private String reaRepaymentName; + @ApiModelProperty("实际还款人电话") + private String reaRepaymentPhone; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 2d684bfda5..96c58323e0 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -157,4 +157,8 @@ public interface BusSalesOrderVehicleFeign { @GetMapping("/selectByBorrowerSid") @ResponseBody ResultBean> selectByBorrowerSid(@RequestParam("borrowerSid") String borrowerSid); + + @ApiOperation("维护实际还款人") + @PostMapping("/maintReaRepayment") + public ResultBean maintReaRepayment(@RequestBody ReaRepaymentDto reaRepaymentDto); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index 6d2480add0..02413447de 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -153,4 +153,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean maintReaRepayment(ReaRepaymentDto reaRepaymentDto) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/ReaRepaymentDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/ReaRepaymentDto.java new file mode 100644 index 0000000000..35e064447f --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/ReaRepaymentDto.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.buscenter.api.bussalesordervehicle; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class ReaRepaymentDto { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String carNum; + @ApiModelProperty("客户名称") + private String custName; + @ApiModelProperty("贷款人") + private String borrerName; + @ApiModelProperty("实际还款人名称") + private String reaRepaymentName; + @ApiModelProperty("实际还款人电话") + private String reaRepaymentPhone; + @ApiModelProperty("销售订单车辆sid") + private String saleVehSid; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 843f8a946b..555d27244e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -175,4 +175,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper selectByBorrowerSid(String borrowerSid); + + @Update("update bus_sales_order_vehicle set reaRepaymentName = #{reaRepaymentName},reaRepaymentPhone = #{reaRepaymentPhone} where sid = #{saleVehSid}") + void maintReaRepayment(@Param("saleVehSid") String saleVehSid,@Param("reaRepaymentName") String reaRepaymentName,@Param("reaRepaymentPhone") String reaRepaymentPhone); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index 34ea1cd5e2..63021a6fe4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java @@ -173,4 +173,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { public ResultBean> selectByBorrowerSid(String borrowerSid) { return busSalesOrderVehicleService.selectByBorrowerSid(borrowerSid); } + + @Override + public ResultBean maintReaRepayment(ReaRepaymentDto reaRepaymentDto) { + ResultBean rb = ResultBean.fireFail(); + busSalesOrderVehicleService.maintReaRepayment(reaRepaymentDto); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 452fd6f46d..ff8aad4ecb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java @@ -649,4 +649,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService busSalesOrderVehicleList = baseMapper.selectByBorrowerSid(borrowerSid); return rb.success().setData(busSalesOrderVehicleList); } + + public void maintReaRepayment(ReaRepaymentDto reaRepaymentDto) { + baseMapper.maintReaRepayment(reaRepaymentDto.getSaleVehSid(),reaRepaymentDto.getReaRepaymentName(),reaRepaymentDto.getReaRepaymentPhone()); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java index 24cb580fb6..4e3012479d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java @@ -29,4 +29,8 @@ public interface LoanBeOverdueVehFegin { @ApiOperation("分配风控专员") @PostMapping("/allocationRiskStaff") public ResultBean allocationRiskStaff(@RequestBody AllocationQuery allocationQuery); + + @ApiOperation("初始化实际还款人") + @PostMapping("/initReaRepayment") + public ResultBean initReaRepayment(@RequestParam("saleVehSid") String saleVehSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/ReaRepaymentVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/ReaRepaymentVo.java new file mode 100644 index 0000000000..569a7c7787 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/ReaRepaymentVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loanbeoverdueveh; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class ReaRepaymentVo { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String carNum; + @ApiModelProperty("客户名称") + private String custName; + @ApiModelProperty("贷款人") + private String borrerName; + @ApiModelProperty("实际还款人名称") + private String reaRepaymentName; + @ApiModelProperty("实际还款人电话") + private String reaRepaymentPhone; + @ApiModelProperty("销售订单车辆sid") + private String saleVehSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java index 867870432b..814a668c01 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit; import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo; +import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.ReaRepaymentVo; import com.yxt.anrui.riskcenter.api.loanborrower.AppLoanBorrowerListVo; import com.yxt.anrui.riskcenter.api.loanborrower.LoanBorrower; import com.yxt.anrui.riskcenter.api.loanborrower.LoanBorrowerVo; @@ -23,4 +24,6 @@ public interface LoanBeOverdueVehMapper { void allocationRiskStaff(@Param("saleVehSid") String saleVehSid, @Param("userSid") String userSid, @Param("userName") String userName); List initVehListByBorrSid(String borrowerSid); + + ReaRepaymentVo initReaRepayment(String saleVehSid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index 023e9e0f5f..3b3a52822e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -5,134 +5,148 @@ - - - UPDATE - anrui_buscenter.`bus_sales_order_vehicle` - SET riskStaffUserSid = #{userSid}, - riskStaffUserName = #{userName} - WHERE sid = #{saleVehSid} - - - + + + UPDATE + anrui_buscenter.`bus_sales_order_vehicle` + SET riskStaffUserSid = #{userSid}, + riskStaffUserName = #{userName} + WHERE sid = #{saleVehSid} + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java index 24afa6e3f4..e82511ac60 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh; -import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.AllocationQuery; -import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehFegin; -import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehQuery; -import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo; +import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.*; import com.yxt.anrui.riskcenter.api.loanborrower.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -41,4 +38,11 @@ public class LoanBeOverdueVehRest implements LoanBeOverdueVehFegin { public ResultBean allocationRiskStaff(AllocationQuery allocationQuery) { return loanBeOverdueVehService.allocationRiskStaff(allocationQuery); } + + @Override + public ResultBean initReaRepayment(String saleVehSid) { + ResultBean rb = ResultBean.fireFail(); + ReaRepaymentVo reaRepaymentVo = loanBeOverdueVehService.initReaRepayment(saleVehSid); + return rb.success().setData(reaRepaymentVo); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java index 23b0dbcb76..77ae540844 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java @@ -2,13 +2,13 @@ package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; +import com.yxt.anrui.buscenter.api.bussalesvehicle.BusSalesVehicleFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit; -import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.AllocationQuery; -import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehQuery; -import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo; +import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.*; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -26,6 +26,8 @@ public class LoanBeOverdueVehService { private SysUserFeign sysUserFeign; @Autowired private LoanBeOverdueVehMapper loanBeOverdueVehMapper; + @Autowired + private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; public PagerVo listPageVo(PagerQuery pq) { LoanBeOverdueVehQuery query = pq.getParams(); @@ -186,4 +188,9 @@ public class LoanBeOverdueVehService { public List initVehListByBorrSid(String borrowerSid) { return loanBeOverdueVehMapper.initVehListByBorrSid(borrowerSid); } + + public ReaRepaymentVo initReaRepayment(String saleVehSid) { + ReaRepaymentVo reaRepaymentVo = loanBeOverdueVehMapper.initReaRepayment(saleVehSid); + return reaRepaymentVo; + } } \ No newline at end of file From ede846f61f222f7cfc7d26eab85f9a38b9d0bf5a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 25 Dec 2023 14:09:51 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=9E=AB=E6=AC=BE=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loanbepadsincereapply/DkRecordVo.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java index 236e2301a6..284c8902e4 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/DkRecordVo.java @@ -63,19 +63,19 @@ public class DkRecordVo implements Vo { private String borrowerName; // 贷款人名称 @ApiModelProperty("期数") private String period; // 期数 - @ApiModelProperty("系统逾期金额") + @ApiModelProperty("平台逾期月还") private String sysBeMoney; // 系统逾期金额 - @ApiModelProperty("资方逾期金额") + @ApiModelProperty("资方逾期月还") private String bankBeMoney; // 资方逾期金额 - @ApiModelProperty("资方逾期罚息") + @ApiModelProperty("资方逾期利息") private String bankBeInter; // 资方逾期罚息 @ApiModelProperty("垫款金额") private String padMoney; // 垫款金额 - @ApiModelProperty("付款账户") + @ApiModelProperty("付款账户名称") private String paymentAccount; // 付款账户 @ApiModelProperty("付款账号") private String paymentNum; // 付款账号 - @ApiModelProperty("资方收款账户") + @ApiModelProperty("资方收款账户名称") private String bankCollectionAcc; // 资方收款账户 @ApiModelProperty("资方收款账号") private String bankCollectionNum; // 资方收款账号 From f63f43c2aaa5e4eec6e20f94b4a1955e6895995b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 25 Dec 2023 15:30:23 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9E=AB=E6=AC=BE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/advancerequest/advancerequest.js | 11 +- anrui-riskcenter-ui/src/router/index.js | 6 + .../views/advancerequest/advancedetails.vue | 240 ++++++++++++++++++ 3 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 anrui-riskcenter-ui/src/views/advancerequest/advancedetails.vue diff --git a/anrui-riskcenter-ui/src/api/advancerequest/advancerequest.js b/anrui-riskcenter-ui/src/api/advancerequest/advancerequest.js index 28951206ed..69f118a441 100644 --- a/anrui-riskcenter-ui/src/api/advancerequest/advancerequest.js +++ b/anrui-riskcenter-ui/src/api/advancerequest/advancerequest.js @@ -1,7 +1,7 @@ import request from '@/utils/request' export default { - // 查询分页列表 + // 垫款申请--查询分页列表 listPage: function(params) { return request({ url: '/riskcenter/v1/loanbepadsincereapply/listPage', @@ -10,6 +10,15 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 垫款明细查询--分页列表 + dkListPage: function(params) { + return request({ + url: '/riskcenter/v1/loanbepadsincereapply/dkListPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, saveOrUpdate: function(data) { return request({ url: '/riskcenter/v1/loanbepadsincereapply/save', diff --git a/anrui-riskcenter-ui/src/router/index.js b/anrui-riskcenter-ui/src/router/index.js index 2cc18b5d94..81aba04987 100644 --- a/anrui-riskcenter-ui/src/router/index.js +++ b/anrui-riskcenter-ui/src/router/index.js @@ -392,6 +392,12 @@ export const constantRoutes = [ component: () => import('@/views/advancerequest/advancerequest.vue'), name: 'AdvanceRequest', meta: { title: '垫款申请管理', noCache: true } + }, + { + path: '/advancerequest/advancedetails', + component: () => import('@/views/advancerequest/advancedetails.vue'), + name: 'AdvanceDetails', + meta: { title: '垫款明细查询', noCache: true } } ] }, diff --git a/anrui-riskcenter-ui/src/views/advancerequest/advancedetails.vue b/anrui-riskcenter-ui/src/views/advancerequest/advancedetails.vue new file mode 100644 index 0000000000..82a4a2f5ef --- /dev/null +++ b/anrui-riskcenter-ui/src/views/advancerequest/advancedetails.vue @@ -0,0 +1,240 @@ + + + + From aafd74dda1263aa3664db37a6a05badfbfcbd74d Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 25 Dec 2023 17:18:06 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=BE=E6=9C=9F?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8--=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E5=AE=9E=E9=99=85=E8=BF=98=E6=AC=BE=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/overduevehicle/overduevehicle.js | 17 +++ .../overduevehicle/overduevehicleByRisk.vue | 105 ++++++++++++++++++ .../overduevehicle/vehiclecollectionentry.vue | 12 +- 3 files changed, 132 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js b/anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js index 1bb6aa4086..e1c4f04ac0 100644 --- a/anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js +++ b/anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js @@ -28,6 +28,23 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 初始化--实际还款人 + initReaRepayment: function(data) { + return request({ + url: '/riskcenter/v1/Loanbeoverdueveh/initReaRepayment', + method: 'post', + params: data + }) + }, + // 保存--实际还款人 + maintReaRepayment: function(data) { + return request({ + url: '/buscenter/v1/bussalesordervehicle/maintReaRepayment', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, // 初始化 init: function(data) { return request({ diff --git a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue index 0e9587185b..4ecde35499 100644 --- a/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue +++ b/anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue @@ -106,6 +106,57 @@ + + + + + + 车架号 + + + {{ formobj.vinNo }} + + + 车牌号 + + + {{ formobj.carNum }} + + + + + 客户名称 + + + {{ formobj.custName }} + + + 贷款人 + + + {{ formobj.borrerName }} + + + + + 实际还款人名称 + + + + + + 实际还款人电话 + + + + + + +
+ 保存 + 关闭 +
+ @@ -131,7 +182,15 @@ export default { data() { return { btndisabled: false, + dialogVisible: false, btnList: [ + { + type: 'primary', + size: 'small', + icon: '', + btnKey: 'toMaintain', + btnLabel: '维护还款操作人' + }, { type: 'primary', size: 'small', @@ -204,6 +263,15 @@ export default { collectionStartDate: '', collectionEndDate: '' } + }, + formobj: { + borrerName: '', + carNum: '', + custName: '', + reaRepaymentName: '', + reaRepaymentPhone: '', + saleVehSid: '', + vinNo: '' } } }, @@ -227,6 +295,9 @@ export default { btnHandle(btnKey) { console.log('XXXXXXXXXXXXXXX ' + btnKey) switch (btnKey) { + case 'toMaintain': + this.toMaintain() + break case 'toCollection': this.toCollection() break @@ -304,6 +375,40 @@ export default { this.viewState = 4 this.$refs['divRecords'].showInfo(row) }, + toMaintain() { + if (this.sids.length === 1) { + this.dialogVisible = true + this.formobj = { + borrerName: '', + carNum: '', + custName: '', + reaRepaymentName: '', + reaRepaymentPhone: '', + saleVehSid: '', + vinNo: '' + } + req.initReaRepayment({ saleVehSid: this.sids[0] }).then((resp) => { + if (resp.success) { + this.formobj = resp.data + } + }) + } else { + this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) + } + }, + handleSave() { + if (this.formobj.reaRepaymentName === '' || this.formobj.reaRepaymentPhone === '') { + this.$message({ showClose: true, type: 'error', message: '实际还款人名称和电话不能为空' }) + return + } + req.maintReaRepayment(this.formobj).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.dialogVisible = false + this.getList() + } + }) + }, toCollection() { if (this.sids.length === 1) { this.viewState = 2 diff --git a/anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue b/anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue index 8551a1b923..f6e0ddfbdf 100644 --- a/anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue +++ b/anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue @@ -31,10 +31,15 @@
车辆列表
+ + + - - + + @@ -319,6 +324,9 @@ export default { } }) }, + handleDelete(index) { + this.formobj.loanBeCollectionRecordVehInitList.splice(index, 1) + }, collectionTypeChange(value) { const choose = this.collectionType_list.filter((item) => item.dictKey === value) if (choose.length > 0 && choose !== null) { From 490998a2d5993ac4dfb9a4cd3869764d0f132be6 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 25 Dec 2023 17:48:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=87=91=E8=9E=8D?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E5=8D=95=E4=BC=98=E5=8C=96=20=E5=82=AC?= =?UTF-8?q?=E6=94=B6=E5=BD=95=E5=85=A5=E6=8C=89=E7=85=A7=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basevehicleout/BaseVehicleOutService.java | 4 ++++ .../LoanBeCollectionRecordVehInit.java | 4 ++++ .../riskcenter/api/loanbepadsincereapply/DkRecordQuery.java | 4 ++++ .../riskcenter/api/loanbepadsincereapply/DkRecordVo.java | 4 ++++ .../LoanBeCollectionRecordService.java | 2 ++ .../loanbepadsincereapply/LoanBePadsincereApplyMapper.xml | 2 ++ .../loanbepadsincereapply/LoanBePadsincereApplyService.java | 6 ++++++ 7 files changed, 26 insertions(+) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 3aa9df3d07..5f22cfa0c4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -1638,8 +1638,12 @@ public class BaseVehicleOutService extends MybatisBaseService loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid()); for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) { + loanBeCollectionRecordVehInit.setCustNameAndPhone(loanBeCollectionRecordVehInit.getCustName() + loanBeCollectionRecordVehInit.getCustPhone()); BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData(); + loanBeCollectionRecordVehInit.setReaRepaymentNameAndPhone(busSalesOrderVehicle1.getReaRepaymentName() + busSalesOrderVehicle1.getReaRepaymentPhone()); //催收记录sid loanBeCollectionRecordVehInit.setSaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid()); //开票管理sid diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml index 338b8e9934..629a08150d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyMapper.xml @@ -50,6 +50,8 @@