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 6b87aa0147..d6a0a7c08b 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 @@ -159,6 +159,9 @@ public class LoanBeOverdueVehService { if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("a1.vinNo", query.getVinNo()); } + if (StringUtils.isNotBlank(query.getNames())) { + qw.and(wrapper -> wrapper.like("a1.loanContractNo", query.getNames()).or().like("a1.borrowerName", query.getNames()).or().like("a1.vinNo", query.getNames())); + } String collectionStartDate = query.getCollectionStartDate(); String collectionEndDate = query.getCollectionEndDate(); qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java index 6641df8a3f..ac3d518fe9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java @@ -13,10 +13,8 @@ public class AppBeOverdueVehVo implements Vo { @ApiModelProperty("销售订单车辆sid") private String saleVehSid; - @ApiModelProperty("分公司") - private String useOrgName; - @ApiModelProperty("发起部门") - private String dept; + @ApiModelProperty("分公司-发起部门") + private String publishInfo; @ApiModelProperty("贷款合同编号") private String loanContractNo; @ApiModelProperty("车架号") 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 d493ae46e6..f0319bc0bf 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 @@ -423,8 +423,7 @@ public class BeCollectionService { for (LoanBeOverdueVehVo record : records) { AppBeOverdueVehVo appBeOverdueVehVo = new AppBeOverdueVehVo(); appBeOverdueVehVo.setSaleVehSid(record.getSaleVehSid()); - appBeOverdueVehVo.setUseOrgName(record.getUseOrgName()); - appBeOverdueVehVo.setDept(record.getDept()); + appBeOverdueVehVo.setPublishInfo(record.getUseOrgName() + "-" + record.getDept()); appBeOverdueVehVo.setLoanContractNo(record.getLoanContractNo()); appBeOverdueVehVo.setVinNo(record.getVinNo()); appBeOverdueVehVo.setCarNum(record.getCarNum());