diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java index fc11dbc052..21a0c0514e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java @@ -83,14 +83,14 @@ public class LoanBeCollectionVehDetailsVo implements Vo { private String beOverdueMoney; @ApiModelProperty("逾期金额换算期数") private String beOverdueMoneyAndPeriod; - @ApiModelProperty("锁车费用") - private String lockCarMoney; // 锁车费用 - @ApiModelProperty("锁车状态") - private String lockCarState; // 锁车状态 + @ApiModelProperty("远程控制费用") + private String lockCarMoney; + @ApiModelProperty("远程控制状态") + private String lockCarState; @ApiModelProperty("销售订单车辆sid") - private String saleVehSid; // 销售订单车辆sid + private String saleVehSid; @ApiModelProperty("催收申请sid") - private String mainSid; // 催收申请sid + private String mainSid; @ApiModelProperty private List hkxyFiles = new ArrayList<>(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java index b7cc6a5295..42ab0397d9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java @@ -15,6 +15,8 @@ public class LoanBeOverdueVehQuery implements Query { private String loanContractNo; @ApiModelProperty("贷款人名称") private String borrowerName; + @ApiModelProperty("还款操作人") + private String repaymentName; @ApiModelProperty("车架号") private String vinNo; @ApiModelProperty("车牌号") 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 3e006d7854..408127cd47 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 @@ -23,6 +23,7 @@ SUM(a1.yd_zjzyf) AS fundPossCostMoney, a1.riskStaffUserSid, a1.riskStaffUserName, + a1.reaRepaymentName AS repaymentName, a1.createTime, a1.orgSidPath FROM (SELECT lrpd.sid, @@ -49,6 +50,7 @@ lrpd.createBySid, bv.riskStaffUserSid, bv.riskStaffUserName, + bv.reaRepaymentName, lr.createTime FROM `loan_repayment_plan_details` lrpd LEFT JOIN `loan_repayment_history` lrh 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 77ae540844..6b87aa0147 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 @@ -87,6 +87,9 @@ public class LoanBeOverdueVehService { if (StringUtils.isNotBlank(query.getBorrowerName())) { qw.like("a1.borrowerName", query.getBorrowerName()); } + if (StringUtils.isNotBlank(query.getRepaymentName())) { + qw.like("a1.reaRepaymentName", query.getRepaymentName()); + } if (StringUtils.isNotBlank(query.getCarNum())) { qw.like("a1.vehMark", query.getCarNum()); } @@ -141,6 +144,9 @@ public class LoanBeOverdueVehService { if (StringUtils.isNotBlank(query.getBorrowerName())) { qw.like("a1.borrowerName", query.getBorrowerName()); } + if (StringUtils.isNotBlank(query.getRepaymentName())) { + qw.like("a1.reaRepaymentName", query.getRepaymentName()); + } if (StringUtils.isNotBlank(query.getCarNum())) { qw.like("a1.vehMark", query.getCarNum()); } 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 b4e41803a3..d493ae46e6 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 @@ -478,10 +478,21 @@ public class BeCollectionService { appBeCollectionRecordVehInit.setBeOverdueMoney(loanBeCollectionRecordVehInit.getBeOverdueMoney()); appBeCollectionRecordVehInit.setBeOverdueMoneyAndPeriod(loanBeCollectionRecordVehInit.getBeOverdueMoneyAndPeriod()); appBeCollectionRecordVehInit.setCsjlSid(loanBeCollectionRecordVehInit.getSaleVehSid()); - //appBeCollectionRecordVehInit.setKpglSid(loanBeCollectionRecordVehInit.getKpglSid()); - //appBeCollectionRecordVehInit.setYhmxSid(loanBeCollectionRecordVehInit.getYhmxSid()); - //appBeCollectionRecordVehInit.setJrfaSid(loanBeCollectionRecordVehInit.getJrfaSid()); - //appBeCollectionRecordVehInit.setJfkcSid(loanBeCollectionRecordVehInit.getKcbgSid()); + List sids = loanBeCollectionRecordVehInit.getSids(); + for (LoanBeCollectionVehFile loanBeCollectionVehFile : sids) { + if ("开票信息".equals(loanBeCollectionVehFile.getName())){ + appBeCollectionRecordVehInit.setKpglSid(loanBeCollectionVehFile.getSid()); + } + if ("月还明细".equals(loanBeCollectionVehFile.getName())){ + appBeCollectionRecordVehInit.setYhmxSid(loanBeCollectionVehFile.getSid()); + } + if ("金融方案".equals(loanBeCollectionVehFile.getName())){ + appBeCollectionRecordVehInit.setJrfaSid(loanBeCollectionVehFile.getSid()); + } + if ("家访考察报告".equals(loanBeCollectionVehFile.getName())){ + appBeCollectionRecordVehInit.setJfkcSid(loanBeCollectionVehFile.getSid()); + } + } appBeCollectionRecordVehInits.add(appBeCollectionRecordVehInit); } appBeCollectionRecordInit.setAppBeCollectionRecordVehInitList(appBeCollectionRecordVehInits);