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 9078e5ee5a..021d748684 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 @@ -87,5 +87,5 @@ public class LoanBeCollectionVehDetailsVo implements Vo { private String mainSid; // 催收申请sid @ApiModelProperty - private Map sids; + private List sids; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java new file mode 100644 index 0000000000..c54996ba51 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFile.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanbecollectionveh; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo
+ * Description: 逾期催收车辆 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情") +public class LoanBeCollectionVehFile implements Vo { + + private String name; + private String sid; +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java index 14564be24c..754fe1b3e5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java @@ -45,6 +45,7 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecor import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto; +import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile; import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; @@ -71,10 +72,7 @@ import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyF import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; +import java.util.*; /** * Project: anrui-riskcenter(催收措施申请)
@@ -231,25 +229,38 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanBeCollectionVehDetailsVos = loanBeCollectionVehService.selByMainSid(sid); for (LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo : loanBeCollectionVehDetailsVos) { - HashMap map = new HashMap<>(); + List loanBeCollectionVehFiles = new ArrayList<>(); + LoanBeCollectionVehFile loanBeCollectionVehFile = new LoanBeCollectionVehFile(); BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionVehDetailsVo.getSaleVehSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionVehDetailsVo.getSaleVehSid()).getData(); //催收记录sid - map.put("催收记录", loanBeCollectionVehDetailsVo.getSaleVehSid()); + loanBeCollectionVehFile.setName("催收记录"); + loanBeCollectionVehFile.setSid(loanBeCollectionVehDetailsVo.getSaleVehSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //开票管理sid FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData(); - map.put("开票信息", finVehicleInvoice.getSid()); + loanBeCollectionVehFile.setName("开票信息"); + loanBeCollectionVehFile.setSid(finVehicleInvoice.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //月还明细sid - map.put("月还明细", loanBeCollectionVehDetailsVo.getSaleVehSid()); + loanBeCollectionVehFile.setName("月还明细"); + loanBeCollectionVehFile.setSid(loanBeCollectionVehDetailsVo.getSaleVehSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //金融方案sid LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrder.getSid()); - map.put("金融方案", loanSolutions.getSid()); + loanBeCollectionVehFile.setName("金融方案"); + loanBeCollectionVehFile.setSid(loanSolutions.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //家访考察报告sid String jfkcSid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle1.getBorrowerSid()); - map.put("家访考察报告", jfkcSid); + loanBeCollectionVehFile.setName("家访考察报告"); + loanBeCollectionVehFile.setSid(jfkcSid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //家访考察资料sid - map.put("家访考察资料", jfkcSid); - loanBeCollectionVehDetailsVo.setSids(map); + loanBeCollectionVehFile.setName("家访考察资料"); + loanBeCollectionVehFile.setSid(jfkcSid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + loanBeCollectionVehDetailsVo.setSids(loanBeCollectionVehFiles); } vo.setLoanBeCollectionVehDetails(loanBeCollectionVehDetailsVos); return vo; @@ -268,27 +279,40 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid()); List loanBeCollectionVehDetailsVos = new ArrayList<>(); for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) { + List loanBeCollectionVehFiles = new ArrayList<>(); + LoanBeCollectionVehFile loanBeCollectionVehFile = new LoanBeCollectionVehFile(); LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo = new LoanBeCollectionVehDetailsVo(); BeanUtil.copyProperties(loanBeCollectionRecordVehInit, loanBeCollectionVehDetailsVo); - HashMap map = new HashMap<>(); BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData(); //催收记录sid - map.put("催收记录", loanBeCollectionRecordVehInit.getSaleVehSid()); + loanBeCollectionVehFile.setName("催收记录"); + loanBeCollectionVehFile.setSid(loanBeCollectionRecordVehInit.getSaleVehSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //开票管理sid FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData(); - map.put("开票信息", finVehicleInvoice.getSid()); + loanBeCollectionVehFile.setName("开票信息"); + loanBeCollectionVehFile.setSid(finVehicleInvoice.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //月还明细sid - map.put("月还明细", saleVehSid); + loanBeCollectionVehFile.setName("月还明细"); + loanBeCollectionVehFile.setSid(saleVehSid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //金融方案sid LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(loanBeCollectionRecordVehInit.getSalesOrderSid()); - map.put("金融方案", loanSolutions.getSid()); + loanBeCollectionVehFile.setName("金融方案"); + loanBeCollectionVehFile.setSid(loanSolutions.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //家访考察报告sid String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid()); - map.put("家访考察报告", sid); + loanBeCollectionVehFile.setName("家访考察报告"); + loanBeCollectionVehFile.setSid(sid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); //家访考察资料sid - map.put("家访考察资料", sid); - loanBeCollectionVehDetailsVo.setSids(map); + loanBeCollectionVehFile.setName("家访考察资料"); + loanBeCollectionVehFile.setSid(sid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + loanBeCollectionVehDetailsVo.setSids(loanBeCollectionVehFiles); loanBeCollectionVehDetailsVo.setSaleVehSid(saleVehSid); loanBeCollectionVehDetailsVos.add(loanBeCollectionVehDetailsVo); }