From da36a2534b92c33d8f3419cf117f398672abf1e1 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 29 Jan 2024 15:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=AE=A1=E6=89=B9=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanSecondarySalesApplyDetailsVo.java | 2 +- .../LoanSecondarySalesApplyDto.java | 2 +- .../LoanSecondarySalesApplyMapper.java | 2 +- .../LoanSecondarySalesApplyMapper.xml | 15 ++++++- .../LoanSecondarySalesApplyService.java | 42 ++++++------------- .../secondarysales/SecondarySalesAppVos.java | 4 ++ .../secondarysales/SecondarySalesService.java | 8 +++- 7 files changed, 40 insertions(+), 35 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java index 62bc675c9c..ffc1c60efc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java @@ -57,7 +57,7 @@ public class LoanSecondarySalesApplyDetailsVo { @ApiModelProperty("其他车况说明") private String illustrate; @ApiModelProperty("车辆照片") - private List filesList = new ArrayList<>(); + private List filesList = new ArrayList<>(); @ApiModelProperty("已还金额") private String alRepaidMoney; @ApiModelProperty("当前逾期金额") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDto.java index 066f061695..f1ec634c34 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDto.java @@ -57,7 +57,7 @@ public class LoanSecondarySalesApplyDto { @ApiModelProperty("其他车况说明") private String illustrate; @ApiModelProperty("车辆照片") - private List filesList = new ArrayList<>(); + private List filesList = new ArrayList<>(); @ApiModelProperty("已还金额") private String alRepaidMoney; @ApiModelProperty("当前逾期金额") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.java index 711fc62312..4b31e21e0e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.java @@ -20,7 +20,7 @@ import java.util.Map; **/ @Mapper public interface LoanSecondarySalesApplyMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw,@Param("vinNo") String vinNo,@Param("vehMark") String vehMark); int updateFlowFiled(Map beanToMap); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml index 537e2d16b9..897dfe6c30 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyMapper.xml @@ -11,8 +11,10 @@ DATE_FORMAT(la.createTime, '%Y-%m-%d') as createDate, la.closeDate, la.loanContractNo, - (select group_concat(lv.vinNo) from loan_secondary_sales_veh lv where lv.mainSid = la.sid) as vinNo, - (select group_concat(lv.vehMark) from loan_secondary_sales_veh lv where lv.mainSid = la.sid) as vehMark, + ss.vinNo, + ss.vehmark, + la.bankName, la.bankContractNo, la.customerName, @@ -25,9 +27,18 @@ la.procInstId from loan_secondary_sales_apply la left join loan_secondary_sales_cost lc on lc.mainSid = la.sid + left join (select group_concat(lv.vinNo) as vinNo,group_concat(lv.vehMark) as vehmark,lv.mainSid from loan_secondary_sales_veh lv) ss on ss.mainSid = la.sid ${ew.sqlSegment} + having 1 = 1 + + and ss.vinNo like concat('%', #{vinNo}, '%') + + + and ss.vehMark like concat('%', #{vehMark}, '%') + + order by la.createTime desc diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java index 6d69571838..2ab12383ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java @@ -130,13 +130,6 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (la.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" ); + if(StringUtils.isNotBlank(query.getArrearsAll())){ + qw.like("lc.arrearsAll",query.getArrearsAll()); + } //========================================数据授权开始 if (StringUtils.isNotBlank(query.getMenuUrl())) { //======================= @@ -203,9 +199,8 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); + IPage pagging = baseMapper.selectPageVo(page, qw,query.getVinNo(),query.getVehMark()); List paggingRecords = pagging.getRecords(); paggingRecords.removeAll(Collections.singleton(null)); if (!paggingRecords.isEmpty()) { @@ -601,11 +596,11 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService filss = dto.getFilesList(); + List filss = dto.getFilesList(); + filss.removeAll(Collections.singleton(null)); if (filss.size() > 0) { - List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); - if (!filesList.isEmpty()) { - String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + if (!filss.isEmpty()) { + String files = String.join(",", filss).replaceAll(fileUploadComponent.getUrlPrefix(), ""); loanSecondarySalesApply.setFiles(files); } } @@ -628,11 +623,10 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService filss = dto.getFilesList(); + List filss = dto.getFilesList(); if (!filss.isEmpty()) { - List filesList = filss.stream().map(v -> v.getUrl()).collect(Collectors.toList()); - if (!filesList.isEmpty()) { - String files = String.join(",", filesList).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + if (!filss.isEmpty()) { + String files = String.join(",", filss).replaceAll(fileUploadComponent.getUrlPrefix(), ""); loanSecondarySalesApply.setFiles(files); } } else { @@ -743,12 +737,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService list = new ArrayList<>(); if (StringUtils.isNotBlank(loanReturnInboundApply.getFiles())) { List fileList = Arrays.asList(loanReturnInboundApply.getFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); - for (int j = 0; j < fileList.size(); j++) { - UrlQuery urlQuery = new UrlQuery(); - urlQuery.setUrl(fileList.get(j)); - list.add(urlQuery); - } - loanSecondarySalesApplyDetailsVo.setFilesList(list); + loanSecondarySalesApplyDetailsVo.setFilesList(fileList); } } LoanSecondarySalesCostVo loanSecondarySalesCost = new LoanSecondarySalesCostVo(); @@ -873,12 +862,7 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService list = new ArrayList<>(); if (StringUtils.isNotBlank(files)) { List fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList()); - for (int i = 0; i < fileList.size(); i++) { - UrlQuery urlQuery = new UrlQuery(); - urlQuery.setUrl(fileList.get(i)); - list.add(urlQuery); - } - loanSecondarySalesApplyDetailsVo.setFilesList(list); + loanSecondarySalesApplyDetailsVo.setFilesList(fileList); } loanSecondarySalesApplyDetailsVo.setOrgPath(loanSecondarySalesApply.getOrgSidPath()); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java index 0c6b33f2b9..8a531dc48c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/secondarysales/SecondarySalesAppVos.java @@ -2,6 +2,8 @@ package com.yxt.anrui.terminal.api.risk.secondarysales; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.base.common.CarModelVo; +import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -94,4 +96,6 @@ public class SecondarySalesAppVos { @ApiModelProperty("销售订单sid") private String salesOrderSid; + + private CarModelVo jrfa; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java index d74d476d02..ed1bcd4f64 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/secondarysales/SecondarySalesService.java @@ -7,6 +7,7 @@ import com.yxt.anrui.riskcenter.api.loanreturninboundapply.ReturnAppVo; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApplyFeign; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.SecondarySalesAppVo; import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.flowable.*; +import com.yxt.anrui.terminal.api.base.common.CarModelVo; import com.yxt.anrui.terminal.api.risk.returninbound.ReturnInboundAppVo; import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesAppVos; import com.yxt.anrui.terminal.api.risk.secondarysales.SecondarySalesCostAppVo; @@ -15,6 +16,7 @@ import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesDto import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesQuery; import com.yxt.anrui.terminal.api.risk.secondarysales.flowable.SecondarySalesTaskQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyCarPageVo; +import com.yxt.anrui.terminal.biz.base.common.CommonService; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +37,8 @@ public class SecondarySalesService { @Autowired private LoanSecondarySalesApplyFeign loanSecondarySalesApplyFeign; + @Autowired + private CommonService commonService; public ResultBean agreeSecondarySales(SecondarySalesDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -188,8 +192,10 @@ public class SecondarySalesService { otherCostAssumeDetails = otherCostAssumeDetails + secondarySalesCostAppVo.getOtherCostAssume() + "承担"; } secondarySalesCostAppVo.setOtherCostAssumeDetails(otherCostAssumeDetails); - } + ResultBean getLoanSolution = commonService.getLoanSolution(secondarySalesAppVos.getSalesOrderSid()); + CarModelVo carModelVo = getLoanSolution.getData(); + secondarySalesAppVos.setJrfa(carModelVo); return rb.success().setData(secondarySalesAppVos); }