diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml index 04cfef900c..95ddf57c98 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml @@ -65,7 +65,7 @@ and length(bo.orderNo) > 0 and length(bo.platformNo) > 0 - and (cast(bo.platformNo as signed) - IFNULL(cast(bo.lockingNum as signed), '0')) > 0 + select * from bus_sales_vehicle_order where salesOrderSid = #{salesOrderSid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java index af7f5be60f..edd07e7660 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java @@ -202,4 +202,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add); - if (subscriptionMoneyAll.compareTo(new BigDecimal(dto.getCollectionMoney())) != 0) { + if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney())?new BigDecimal(dto.getCollectionMoney()):BigDecimal.ZERO) != 0) { return rb.setMsg("认款总额与收款金额不符"); } List paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java index 0bc4a7fc31..4327a0d5f8 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDetailsVo.java @@ -94,7 +94,7 @@ public class LoanHomevisitFileexamineDetailsVo implements Vo { private List carProperty; @ApiModelProperty("消贷合同编号") - private List loanCotractNos; + private List loanXdCons; @ApiModelProperty("资方合同编号") - private List bankContractNos; + private List loanZfCons; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java index da1166136d..e5f0b8a341 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanHomevisitFileexamineDto.java @@ -32,6 +32,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: anrui-riskcenter(家访资料审核)
* File: LoanHomevisitFileexamineDto.java
@@ -49,11 +52,50 @@ import lombok.Data; @ApiModel(value = "家访资料审核 数据传输对象", description = "家访资料审核 数据传输对象") public class LoanHomevisitFileexamineDto implements Dto { - private String sid; // sid - + private String sid; private String remarks; - @ApiModelProperty("家访考察sid") private String homeVisitSid; - @ApiModelProperty("销售订单sid") private String saleOrderSid; + + @ApiModelProperty("定位信息") + private List location = new ArrayList<>(); + @ApiModelProperty("房屋照片") + private List house = new ArrayList<>(); + @ApiModelProperty("门口照片") + private List doorway = new ArrayList<>(); + @ApiModelProperty("客厅卧室") + private List indoor = new ArrayList<>(); + @ApiModelProperty("合影照等") + private List groupPhoto = new ArrayList<>(); + + @ApiModelProperty("贷款人身份证") + private List lenderIdCard = new ArrayList<>(); + @ApiModelProperty("贷款人户口本") + private List lenderAccount = new ArrayList<>(); + @ApiModelProperty("贷款人婚姻证明") + private List lenderMarriageCertificate = new ArrayList<>(); + @ApiModelProperty("贷款人驾驶本") + private List lenderDriverBook = new ArrayList<>(); + @ApiModelProperty("贷款人银行流水") + private List lenderBankStatement = new ArrayList<>(); + @ApiModelProperty("配偶身份证") + private List spouseIdCard = new ArrayList<>(); + @ApiModelProperty("配偶户口本") + private List spouseAccount = new ArrayList<>(); + @ApiModelProperty("担保人身份证") + private List guarantorIdCard = new ArrayList<>(); + @ApiModelProperty("担保人户口本") + private List guarantorAccount = new ArrayList<>(); + + @ApiModelProperty("银行卡") + private List yhkImages = new ArrayList<>(); + @ApiModelProperty("房产") + private List houseProperty = new ArrayList<>(); + @ApiModelProperty("车辆") + private List carProperty = new ArrayList<>(); + + @ApiModelProperty("消贷合同编号") + private List loanXdCons = new ArrayList<>(); + @ApiModelProperty("资方合同编号") + private List loanZfCons = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsDto.java new file mode 100644 index 0000000000..62ae4a29e7 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsDto.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-riskcenter(家访资料审核)
+ * File: LoanHomevisitFileexamineVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo
+ * Description: 家访资料审核 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-08-24 09:29:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情") +public class LoanXdConDetailsDto implements Dto { + + @ApiModelProperty("消贷合同编号") + private String loanCotractNo; + @ApiModelProperty("消贷合同编号页面展示") + private String loanCotractNoShow; + @ApiModelProperty("消贷合同附件") + private List loanCotractImages = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsVo.java new file mode 100644 index 0000000000..4a327f9cee --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanXdConDetailsVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-riskcenter(家访资料审核)
+ * File: LoanHomevisitFileexamineVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo
+ * Description: 家访资料审核 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-08-24 09:29:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情") +public class LoanXdConDetailsVo implements Vo { + + @ApiModelProperty("消贷合同编号") + private String loanCotractNo; + @ApiModelProperty("消贷合同编号页面展示") + private String loanCotractNoShow; + @ApiModelProperty("消贷合同附件") + private List loanCotractImages; +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsDto.java new file mode 100644 index 0000000000..2b1b37233e --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsDto.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-riskcenter(家访资料审核)
+ * File: LoanHomevisitFileexamineVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo
+ * Description: 家访资料审核 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-08-24 09:29:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情") +public class LoanZfConDetailsDto implements Dto { + + @ApiModelProperty("资方合同编号") + private String bankContractNo; + @ApiModelProperty("资方合同编号页面展示") + private String bankContractNoShow; + @ApiModelProperty("资方合同附件") + private List bankContractImages = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsVo.java new file mode 100644 index 0000000000..23020da18b --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitfileexamine/LoanZfConDetailsVo.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-riskcenter(家访资料审核)
+ * File: LoanHomevisitFileexamineVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo
+ * Description: 家访资料审核 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-08-24 09:29:41
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "家访资料审核 视图数据详情", description = "家访资料审核 视图数据详情") +public class LoanZfConDetailsVo implements Vo { + + @ApiModelProperty("资方合同编号") + private String bankContractNo; + @ApiModelProperty("资方合同编号页面展示") + private String bankContractNoShow; + @ApiModelProperty("资方合同附件") + private List bankContractImages; +} \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index 7ed83ec4a7..ed4b47f895 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -191,4 +191,9 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/saveAssetCertificateInfo") @ResponseBody public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveZCLDto dto); + + @ApiOperation("家访考察是否通过") + @PostMapping("/saveReportInfo") + @ResponseBody + public ResultBean saveReportInfo(@RequestParam("comment") String comment, @RequestParam("agree") Boolean agree, @RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index 588a9647b8..ba7c7fbf9a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -185,4 +185,9 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) { return null; } + + @Override + public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java index d146117101..a963ea5dd8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitfileexamine/LoanHomevisitFileexamineService.java @@ -32,26 +32,23 @@ import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoanco import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigate; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateQuery; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDto; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; +import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamine; -import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineQuery; -import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDetailsVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineDto; -import com.yxt.anrui.riskcenter.api.loanhomevisitfileexamine.LoanHomevisitFileexamineFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -75,292 +72,537 @@ import java.util.List; @Service public class LoanHomevisitFileexamineService extends MybatisBaseService { - @Autowired - private SysUserFeign sysUserFeign; - @Autowired - private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; - @Autowired - private LoanHomevisitInvestigateService loanHomevisitInvestigateService; - @Autowired - private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService; + @Autowired + private LoanHomevisitInvestigateService loanHomevisitInvestigateService; + @Autowired + private BusSalesOrderLoancontractFeign busSalesOrderLoancontractFeign; - public PagerVo homeInforListPage(PagerQuery pq) { - LoanHomevisitFileexamineQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("li.state", query.getType()); - qw.eq("bb.busNo", 303); - if (StringUtils.isNotBlank(query.getMenuUrl())) { - //======================= - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgSidPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgSidPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("bo.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("bo.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } else { - PagerVo p = new PagerVo<>(); - return p; - } - } - if (StringUtils.isNotBlank(query.getUseOrgName())) { - qw.like("bo.useOrgName", query.getUseOrgName()); - } - if (StringUtils.isNotBlank(query.getSaleDeptName())) { - qw.like("bo.orgName", query.getSaleDeptName()); - } - if (StringUtils.isNotBlank(query.getStaffName())) { - qw.like("bo.staffName", query.getStaffName()); - } - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.like("bo.contractNo", query.getContractNo()); - } - if (StringUtils.isNotBlank(query.getLoanPeoName())) { - qw.like("bb.borrowerName", query.getLoanPeoName()); - } - if (StringUtils.isNotBlank(query.getPolicyName())) { - qw.like("bb.policyName", query.getPolicyName()); - } - if (StringUtils.isNotBlank(query.getHomeVisStaffName())) { - qw.like("li.homeVisStaffName", query.getHomeVisStaffName()); - } - String orderStartDate = query.getOrderStartDate(); - String orderEndDate = query.getOrderEndDate(); - qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')" - ); - String resHomeVisStartDate = query.getResHomeVisStartDate(); - String resHomeVisEndDate = query.getResHomeVisEndDate(); - qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')" - ); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanHomevisitFileexamineDto dto){ + public PagerVo homeInforListPage(PagerQuery pq) { + LoanHomevisitFileexamineQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("li.state", query.getType()); + qw.eq("bb.busNo", 303); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("bo.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("bo.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getUseOrgName())) { + qw.like("bo.useOrgName", query.getUseOrgName()); + } + if (StringUtils.isNotBlank(query.getSaleDeptName())) { + qw.like("bo.orgName", query.getSaleDeptName()); + } + if (StringUtils.isNotBlank(query.getStaffName())) { + qw.like("bo.staffName", query.getStaffName()); + } + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.like("bo.contractNo", query.getContractNo()); + } + if (StringUtils.isNotBlank(query.getLoanPeoName())) { + qw.like("bb.borrowerName", query.getLoanPeoName()); + } + if (StringUtils.isNotBlank(query.getPolicyName())) { + qw.like("bb.policyName", query.getPolicyName()); + } + if (StringUtils.isNotBlank(query.getHomeVisStaffName())) { + qw.like("li.homeVisStaffName", query.getHomeVisStaffName()); + } + String orderStartDate = query.getOrderStartDate(); + String orderEndDate = query.getOrderEndDate(); + qw.apply(StringUtils.isNotBlank(orderStartDate), "date_format (bo.createDate,'%Y-%m-%d') >= date_format('" + orderStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(orderEndDate), "date_format (bo.createDate,'%Y-%m-%d') <= date_format('" + orderEndDate + "','%Y-%m-%d')" + ); + String resHomeVisStartDate = query.getResHomeVisStartDate(); + String resHomeVisEndDate = query.getResHomeVisEndDate(); + qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')" + ); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanHomevisitFileexamineDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(LoanHomevisitFileexamineDto dto){ - LoanHomevisitFileexamine entity = new LoanHomevisitFileexamine(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(LoanHomevisitFileexamineDto dto){ - String dtoSid = dto.getSid(); + return; + } + loanHomevisitInvestigateFileService.delByMainSid(dto.getHomeVisitSid()); + //定位信息 + for (String dwxx : dto.getLocation()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType()); + if (dwxx.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dwxx); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //房屋照片 + for (String fwzp : dto.getHouse()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType()); + if (fwzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + fwzp = fwzp.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(fwzp); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //门口照片 + for (String mkzp : dto.getDoorway()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType()); + if (mkzp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + mkzp = mkzp.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(mkzp); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //客厅卧室 + for (String ktwszp : dto.getIndoor()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType()); + if (ktwszp.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + ktwszp = ktwszp.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(ktwszp); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //合影照等 + for (String hyzd : dto.getGroupPhoto()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType()); + if (hyzd.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + hyzd = hyzd.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(hyzd); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人身份证 + for (String dkrsfz : dto.getLenderIdCard()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType()); + if (dkrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrsfz = dkrsfz.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrsfz); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人户口本 + for (String dkrhkb : dto.getLenderAccount()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType()); + if (dkrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrhkb = dkrhkb.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrhkb); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人婚姻证明 + for (String dkrhyzm : dto.getLenderMarriageCertificate()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType()); + if (dkrhyzm.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrhyzm = dkrhyzm.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzm); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人驾驶本 + for (String dkrjsb : dto.getLenderDriverBook()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType()); + if (dkrjsb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrjsb = dkrjsb.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrjsb); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人银行流水 + for (String dkryhls : dto.getLenderBankStatement()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType()); + if (dkryhls.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkryhls = dkryhls.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkryhls); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //配偶身份证 + for (String posfz : dto.getSpouseIdCard()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType()); + if (posfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + posfz = posfz.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(posfz); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //配偶户口本 + for (String pohkb : dto.getSpouseAccount()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType()); + if (pohkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + pohkb = pohkb.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(pohkb); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //担保人身份证 + for (String dbrsfz : dto.getGuarantorIdCard()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType()); + if (dbrsfz.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dbrsfz = dbrsfz.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dbrsfz); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //担保人户口本 + for (String dbrhkb : dto.getGuarantorAccount()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType()); + if (dbrhkb.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dbrhkb = dbrhkb.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dbrhkb); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //银行卡 + for (String yhk : dto.getYhkImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); + if (yhk.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + yhk = yhk.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(yhk); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //房产 + for (String fc : dto.getHouseProperty()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType()); + if (fc.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + fc = fc.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(fc); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //车辆 + for (String cl : dto.getCarProperty()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType()); + if (cl.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + cl = cl.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(cl); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + List loanXdCons = dto.getLoanXdCons(); + List loanZfCons = dto.getLoanZfCons(); + //消贷合同附件 + for (LoanXdConDetailsDto loanXdCon : loanXdCons) { + List loanCotractImages = loanXdCon.getLoanCotractImages(); + for (String loanCotractImage : loanCotractImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(loanXdCon.getLoanCotractNo()); + if (loanCotractImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + loanCotractImage = loanCotractImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(loanCotractImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + } + //资方合同附件 + for (LoanZfConDetailsDto loanZfCon : loanZfCons) { + List bankContractImages = loanZfCon.getBankContractImages(); + for (String bankContractImage : bankContractImages) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + loanHomevisitInvestigateFileDto.setMainSid(dto.getHomeVisitSid()); + loanHomevisitInvestigateFileDto.setAttachType(loanZfCon.getBankContractNo()); + if (bankContractImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + bankContractImage = bankContractImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(bankContractImage); + loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + } + this.updateByDto(dto); + } + + public void insertByDto(LoanHomevisitFileexamineDto dto) { + LoanHomevisitFileexamine entity = new LoanHomevisitFileexamine(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanHomevisitFileexamineDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - LoanHomevisitFileexamine entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanHomevisitFileexamineDetailsVo fetchDetailsVoBySid(String sid){ - LoanHomevisitFileexamineDetailsVo vo = new LoanHomevisitFileexamineDetailsVo(); - LoanHomevisitFileexamine loanHomevisitFileexamine = fetchBySid(sid); - BeanUtil.copyProperties(loanHomevisitFileexamine,vo); - LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateService.fetchDetailsVoBySid(loanHomevisitFileexamine.getHomeVisitSid()); - List busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData(); - List loanCotractNos = new ArrayList<>(); - List bankContractNos = new ArrayList<>(); - for (BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo : busSalesOrderLoancontractDetailsVos) { - loanCotractNos.add("消贷合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); - if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())){ - bankContractNos.add("资方合同号(暂无)"); - }else { - bankContractNos.add("资方合同号" + "(" +busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); - } - } - vo.setLoanCotractNos(loanCotractNos); - vo.setBankContractNos(bankContractNos); - //定位信息 - List dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType()); - List location = new ArrayList<>(); - if (dwxxImages != null && dwxxImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) { - location.add(dwxxImage.getFileUrl()); - } - } - vo.setLocation(location); - //房屋照片 - List fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType()); - List house = new ArrayList<>(); - if (fwzpImages != null && fwzpImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) { - house.add(fwzpImage.getFileUrl()); - } - } - vo.setHouse(house); - //门口照片 - List mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType()); - List doorway = new ArrayList<>(); - if (mkzpImages != null && mkzpImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) { - doorway.add(mkzpImage.getFileUrl()); - } - } - vo.setDoorway(doorway); - //客厅卧室照片 - List ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType()); - List indoor = new ArrayList<>(); - if (ktwszpImages != null && ktwszpImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) { - indoor.add(ktwszpImage.getFileUrl()); - } - } - vo.setIndoor(indoor); - //合影照等 - List hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType()); - List groupPhoto = new ArrayList<>(); - if (hyzdImages != null && hyzdImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) { - groupPhoto.add(hyzdImage.getFileUrl()); - } - } - vo.setGroupPhoto(groupPhoto); - //贷款人身份证 - List dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType()); - List lenderIdCard = new ArrayList<>(); - if (dkrsfzImages != null && dkrsfzImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) { - lenderIdCard.add(dkrsfzImage.getFileUrl()); - } - } - vo.setLenderIdCard(lenderIdCard); - //贷款人户口本 - List dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType()); - List lenderAccount = new ArrayList<>(); - if (dkrhkbImages != null && dkrhkbImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) { - lenderAccount.add(dkrhkbImage.getFileUrl()); - } - } - vo.setLenderAccount(lenderAccount); - //贷款人婚姻证明 - List dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType()); - List lenderMarriageCertificate = new ArrayList<>(); - if (dkrhyzmImages != null && dkrhyzmImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) { - lenderMarriageCertificate.add(dkrhyzmImage.getFileUrl()); - } - } - vo.setLenderMarriageCertificate(lenderMarriageCertificate); - //贷款人驾驶本 - List dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType()); - List lenderDriverBook = new ArrayList<>(); - if (dkrjsbImages != null && dkrjsbImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) { - lenderDriverBook.add(dkrjsbImage.getFileUrl()); - } - } - vo.setLenderDriverBook(lenderDriverBook); - //贷款人银行流水 - List dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType()); - List lenderBankStatement = new ArrayList<>(); - if (dkryhlsImages != null && dkryhlsImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) { - lenderBankStatement.add(dkryhlsImage.getFileUrl()); - } - } - vo.setLenderBankStatement(lenderBankStatement); - //配偶身份证 - List posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); - List spouseIdCard = new ArrayList<>(); - if (posfzImages != null && posfzImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) { - spouseIdCard.add(posfzImage.getFileUrl()); - } - } - vo.setSpouseIdCard(spouseIdCard); - //配偶户口本 - List pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); - List spouseAccount = new ArrayList<>(); - if (pohkbImages != null && pohkbImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) { - spouseAccount.add(pohkbImage.getFileUrl()); - } - } - vo.setSpouseAccount(spouseAccount); - //担保人身份证 - List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); - List pohkbImage = new ArrayList<>(); - if (dbrsfzImages != null && dbrsfzImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) { - pohkbImage.add(dbrsfzImage.getFileUrl()); - } - } - vo.setGuarantorIdCard(pohkbImage); - //担保人户口本 - List dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); - List guarantorAccount = new ArrayList<>(); - if (dbrhkbImages != null && dbrhkbImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) { - guarantorAccount.add(dbrhkbImage.getFileUrl()); - } - } - vo.setGuarantorAccount(guarantorAccount); - //银行卡 - List yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); - List yhkImagess = new ArrayList<>(); - if (yhkImages != null && yhkImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) { - yhkImagess.add(yhkImage.getFileUrl()); - } - } - vo.setYhkImages(yhkImagess); - //房产 - List fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType()); - List houseProperty = new ArrayList<>(); - if (fcImages != null && fcImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) { - houseProperty.add(fcImage.getFileUrl()); - } - } - vo.setHouseProperty(houseProperty); - //车辆 - List clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType()); - List carProperty = new ArrayList<>(); - if (clImages != null && clImages.size() > 0){ - for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) { - carProperty.add(clImage.getFileUrl()); - } - } - vo.setCarProperty(carProperty); - return vo; - } + } + LoanHomevisitFileexamine entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanHomevisitFileexamineDetailsVo fetchDetailsVoBySid(String sid) { + LoanHomevisitFileexamineDetailsVo vo = new LoanHomevisitFileexamineDetailsVo(); + LoanHomevisitFileexamine loanHomevisitFileexamine = fetchBySid(sid); + BeanUtil.copyProperties(loanHomevisitFileexamine, vo); + LoanHomevisitInvestigateDetailsVo loanHomevisitInvestigateDetailsVo = loanHomevisitInvestigateService.fetchDetailsVoBySid(loanHomevisitFileexamine.getHomeVisitSid()); + //查询消贷合同 + List busSalesOrderLoancontractDetailsVos = busSalesOrderLoancontractFeign.selectByBorrowerSid(loanHomevisitInvestigateDetailsVo.getSaleOrderBorrowerSid()).getData(); + List loanXdConDetailsVos = new ArrayList<>(); + List loanZfConDetailsVos = new ArrayList<>(); + for (BusSalesOrderLoancontractDetailsVo busSalesOrderLoancontractDetailsVo : busSalesOrderLoancontractDetailsVos) { + LoanXdConDetailsVo loanXdConDetailsVo = new LoanXdConDetailsVo(); + List loanCotractImages = new ArrayList<>(); + LoanZfConDetailsVo loanZfConDetailsVo = new LoanZfConDetailsVo(); + List bankContractImages = new ArrayList<>(); + //消贷合同编号 + loanXdConDetailsVo.setLoanCotractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); + loanXdConDetailsVo.setLoanCotractNoShow("消贷合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); + //消贷合同附件 + List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); + if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { + loanCotractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + loanXdConDetailsVo.setLoanCotractImages(loanCotractImages); + } + //资方合同编号 + if (StringUtils.isBlank(busSalesOrderLoancontractDetailsVo.getBankContractNo())) { + loanZfConDetailsVo.setBankContractNoShow("资方合同号(暂无)"); + } else { + loanZfConDetailsVo.setBankContractNo(busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); + loanZfConDetailsVo.setBankContractNoShow("资方合同号" + "(" + busSalesOrderLoancontractDetailsVo.getLoanCotractNo() + ")"); + //资方合同附件 + List loanHomevisitInvestigateFileDetailsVos2 = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(loanHomevisitFileexamine.getHomeVisitSid(), busSalesOrderLoancontractDetailsVo.getLoanCotractNo()); + if (loanHomevisitInvestigateFileDetailsVos2 != null && loanHomevisitInvestigateFileDetailsVos2.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos2) { + bankContractImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + loanZfConDetailsVo.setBankContractImages(bankContractImages); + } + } + } + vo.setLoanXdCons(loanXdConDetailsVos); + vo.setLoanZfCons(loanZfConDetailsVos); + //定位信息 + List dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType()); + List location = new ArrayList<>(); + if (dwxxImages != null && dwxxImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) { + location.add(dwxxImage.getFileUrl()); + } + } + vo.setLocation(location); + //房屋照片 + List fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType()); + List house = new ArrayList<>(); + if (fwzpImages != null && fwzpImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) { + house.add(fwzpImage.getFileUrl()); + } + } + vo.setHouse(house); + //门口照片 + List mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType()); + List doorway = new ArrayList<>(); + if (mkzpImages != null && mkzpImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) { + doorway.add(mkzpImage.getFileUrl()); + } + } + vo.setDoorway(doorway); + //客厅卧室照片 + List ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType()); + List indoor = new ArrayList<>(); + if (ktwszpImages != null && ktwszpImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) { + indoor.add(ktwszpImage.getFileUrl()); + } + } + vo.setIndoor(indoor); + //合影照等 + List hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType()); + List groupPhoto = new ArrayList<>(); + if (hyzdImages != null && hyzdImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) { + groupPhoto.add(hyzdImage.getFileUrl()); + } + } + vo.setGroupPhoto(groupPhoto); + //贷款人身份证 + List dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType()); + List lenderIdCard = new ArrayList<>(); + if (dkrsfzImages != null && dkrsfzImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) { + lenderIdCard.add(dkrsfzImage.getFileUrl()); + } + } + vo.setLenderIdCard(lenderIdCard); + //贷款人户口本 + List dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType()); + List lenderAccount = new ArrayList<>(); + if (dkrhkbImages != null && dkrhkbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) { + lenderAccount.add(dkrhkbImage.getFileUrl()); + } + } + vo.setLenderAccount(lenderAccount); + //贷款人婚姻证明 + List dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType()); + List lenderMarriageCertificate = new ArrayList<>(); + if (dkrhyzmImages != null && dkrhyzmImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) { + lenderMarriageCertificate.add(dkrhyzmImage.getFileUrl()); + } + } + vo.setLenderMarriageCertificate(lenderMarriageCertificate); + //贷款人驾驶本 + List dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType()); + List lenderDriverBook = new ArrayList<>(); + if (dkrjsbImages != null && dkrjsbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) { + lenderDriverBook.add(dkrjsbImage.getFileUrl()); + } + } + vo.setLenderDriverBook(lenderDriverBook); + //贷款人银行流水 + List dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType()); + List lenderBankStatement = new ArrayList<>(); + if (dkryhlsImages != null && dkryhlsImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) { + lenderBankStatement.add(dkryhlsImage.getFileUrl()); + } + } + vo.setLenderBankStatement(lenderBankStatement); + //配偶身份证 + List posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); + List spouseIdCard = new ArrayList<>(); + if (posfzImages != null && posfzImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) { + spouseIdCard.add(posfzImage.getFileUrl()); + } + } + vo.setSpouseIdCard(spouseIdCard); + //配偶户口本 + List pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); + List spouseAccount = new ArrayList<>(); + if (pohkbImages != null && pohkbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) { + spouseAccount.add(pohkbImage.getFileUrl()); + } + } + vo.setSpouseAccount(spouseAccount); + //担保人身份证 + List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); + List pohkbImage = new ArrayList<>(); + if (dbrsfzImages != null && dbrsfzImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) { + pohkbImage.add(dbrsfzImage.getFileUrl()); + } + } + vo.setGuarantorIdCard(pohkbImage); + //担保人户口本 + List dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); + List guarantorAccount = new ArrayList<>(); + if (dbrhkbImages != null && dbrhkbImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) { + guarantorAccount.add(dbrhkbImage.getFileUrl()); + } + } + vo.setGuarantorAccount(guarantorAccount); + //银行卡 + List yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List yhkImagess = new ArrayList<>(); + if (yhkImages != null && yhkImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) { + yhkImagess.add(yhkImage.getFileUrl()); + } + } + vo.setYhkImages(yhkImagess); + //房产 + List fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType()); + List houseProperty = new ArrayList<>(); + if (fcImages != null && fcImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) { + houseProperty.add(fcImage.getFileUrl()); + } + } + vo.setHouseProperty(houseProperty); + //车辆 + List clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType()); + List carProperty = new ArrayList<>(); + if (clImages != null && clImages.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) { + carProperty.add(clImage.getFileUrl()); + } + } + vo.setCarProperty(carProperty); + return vo; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java index 67fb51f1a9..429ac8073d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java @@ -72,4 +72,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanHomevisitInvestigateService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - public ResultBean> homeInforListPage(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = loanHomevisitInvestigateService.homeInforListPage(pq); - return rb.success().setData(pv); - } - - @Override - public ResultBean isPassThrough(String sid, String pass) { - return loanHomevisitInvestigateService.isPassThrough(sid,pass); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody LoanHomevisitInvestigateDto dto){ - ResultBean rb = ResultBean.fireFail(); - loanHomevisitInvestigateService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") + @Autowired + private LoanHomevisitInvestigateService loanHomevisitInvestigateService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanHomevisitInvestigateService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> homeInforListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = loanHomevisitInvestigateService.homeInforListPage(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean isPassThrough(String sid, String pass) { + return loanHomevisitInvestigateService.isPassThrough(sid, pass); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody LoanHomevisitInvestigateDto dto) { + ResultBean rb = ResultBean.fireFail(); + loanHomevisitInvestigateService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - loanHomevisitInvestigateService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + loanHomevisitInvestigateService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - LoanHomevisitInvestigateDetailsVo vo = loanHomevisitInvestigateService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - @Override - public ResultBean saveAppointmentInfo(LoanHomeVisitInvestigateReservationDto dto) { - return loanHomevisitInvestigateService.saveAppointmentInfo(dto); - } - - @Override - public ResultBean getHomeVisitReportInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitReportInfo(sid); - } - - @Override - public ResultBean getHomeVisitDataInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitDataInfo(sid); - } - - @Override - public ResultBean getHomeVisitCustomerInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitCustomerInfo(sid); - } - - @Override - public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) { - return loanHomevisitInvestigateService.saveHomeVisitCustomerInfo(dto); - } - - @Override - public ResultBean getHomeVisitOrderInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitOrderInfo(sid); - } - - @Override - public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateSaveOrderDto dto) { - return loanHomevisitInvestigateService.saveHomeVisitOrderInfo(dto); - } - - @Override - public ResultBean getHomeVisitOperationInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitOperationInfo(sid); - } - - @Override - public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateSaveOperDto dto) { - return loanHomevisitInvestigateService.saveHomeVisitOperationInfo(dto); - } - - @Override - public ResultBean getHomeVisitTransportInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitTransportInfo(sid); - } - - @Override - public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateSaveTranDto dto) { - return loanHomevisitInvestigateService.saveHomeVisitTransportInfo(dto); - } - - @Override - public ResultBean getHomeVisitAssetsInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitAssetsInfo(sid); - } - - @Override - public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateSavePropDto dto) { - return loanHomevisitInvestigateService.saveHomeVisitAssetsInfo(dto); - } - - @Override - public ResultBean getHomeVisitWitnessInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitWitnessInfo(sid); - } - - @Override - public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateSaveJFJZDto dto) { - return loanHomevisitInvestigateService.saveHomeVisitWitnessInfo(dto); - } - - @Override - public ResultBean getHomeVisitProveFileInfo(String sid) { - return loanHomevisitInvestigateService.getHomeVisitProveFileInfo(sid); - } - - @Override - public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateSaveZMWJDto dto) { - return loanHomevisitInvestigateService.saveHomeVisitProveFileInfo(dto); - } - - @Override - public ResultBean getAssetCertificateInfo(String sid) { - return loanHomevisitInvestigateService.getAssetCertificateInfo(sid); - } - - @Override - public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) { - return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomevisitInvestigateDetailsVo vo = loanHomevisitInvestigateService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean saveAppointmentInfo(LoanHomeVisitInvestigateReservationDto dto) { + return loanHomevisitInvestigateService.saveAppointmentInfo(dto); + } + + @Override + public ResultBean getHomeVisitReportInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitReportInfo(sid); + } + + @Override + public ResultBean getHomeVisitDataInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitDataInfo(sid); + } + + @Override + public ResultBean getHomeVisitCustomerInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitCustomerInfo(sid); + } + + @Override + public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitCustomerInfo(dto); + } + + @Override + public ResultBean getHomeVisitOrderInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitOrderInfo(sid); + } + + @Override + public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateSaveOrderDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitOrderInfo(dto); + } + + @Override + public ResultBean getHomeVisitOperationInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitOperationInfo(sid); + } + + @Override + public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateSaveOperDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitOperationInfo(dto); + } + + @Override + public ResultBean getHomeVisitTransportInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitTransportInfo(sid); + } + + @Override + public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateSaveTranDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitTransportInfo(dto); + } + + @Override + public ResultBean getHomeVisitAssetsInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitAssetsInfo(sid); + } + + @Override + public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateSavePropDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitAssetsInfo(dto); + } + + @Override + public ResultBean getHomeVisitWitnessInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitWitnessInfo(sid); + } + + @Override + public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateSaveJFJZDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitWitnessInfo(dto); + } + + @Override + public ResultBean getHomeVisitProveFileInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitProveFileInfo(sid); + } + + @Override + public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateSaveZMWJDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitProveFileInfo(dto); + } + + @Override + public ResultBean getAssetCertificateInfo(String sid) { + return loanHomevisitInvestigateService.getAssetCertificateInfo(sid); + } + + @Override + public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateSaveZCLDto dto) { + return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto); + } + + @Override + public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { + return loanHomevisitInvestigateService.saveReportInfo(comment, agree, sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index 9f98910231..4eec1e48cb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -460,7 +460,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitCustomerInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitCustomerVo loanHomeVisitInvestigateInitCustomerVo = baseMapper.getHomeVisitCustomerInfo(sid); - if (loanHomeVisitInvestigateInitCustomerVo == null){ + if (loanHomeVisitInvestigateInitCustomerVo == null) { loanHomeVisitInvestigateInitCustomerVo = new LoanHomeVisitInvestigateInitCustomerVo(); LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid); BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigate.getSaleOrderBorrowerSid()).getData(); @@ -489,7 +489,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService otherPersonnel = dto.getOtherPersonnel(); - BeanUtil.copyProperties(dto,loanHomevisitInvestigateCustomerDto); + BeanUtil.copyProperties(dto, loanHomevisitInvestigateCustomerDto); loanHomevisitInvestigateCustomerDto.setIsConfirmRealBuyer(dto.getActualBuyer()); loanHomevisitInvestigateCustomerDto.setBorrowerSid(dto.getLenderSid()); loanHomevisitInvestigateCustomerDto.setBorrowerName(dto.getLenderNam()); @@ -505,7 +505,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitOrderInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitOrderVo loanHomeVisitInvestigateInitOrderVos = loanHomevisitInvestigateOrderService.getHomeVisitOrderInfo(sid); - if (loanHomeVisitInvestigateInitOrderVos == null){ + if (loanHomeVisitInvestigateInitOrderVos == null) { loanHomeVisitInvestigateInitOrderVos = new LoanHomeVisitInvestigateInitOrderVo(); loanHomeVisitInvestigateInitOrderVos.setMainSid(sid); } @@ -556,7 +556,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitOperationInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitOperVo loanHomeVisitInvestigateInitOperVo = loanHomevisitInvestigateOperationsService.getHomeVisitOperationInfo(sid); - if (loanHomeVisitInvestigateInitOperVo == null){ + if (loanHomeVisitInvestigateInitOperVo == null) { loanHomeVisitInvestigateInitOperVo = new LoanHomeVisitInvestigateInitOperVo(); loanHomeVisitInvestigateInitOperVo.setMainSid(sid); } @@ -578,7 +578,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitTransportInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitTranVo loanHomeVisitInvestigateInitTranVo = loanHomevisitInvestigateTransportService.getHomeVisitTransportInfo(sid); - if (loanHomeVisitInvestigateInitTranVo == null){ + if (loanHomeVisitInvestigateInitTranVo == null) { loanHomeVisitInvestigateInitTranVo = new LoanHomeVisitInvestigateInitTranVo(); loanHomeVisitInvestigateInitTranVo.setMainSid(sid); } @@ -601,7 +601,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitAssetsInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitPropVo loanHomeVisitInvestigateInitPropVo = loanHomevisitInvestigatePropertyService.getHomeVisitAssetsInfo(sid); - if (loanHomeVisitInvestigateInitPropVo == null){ + if (loanHomeVisitInvestigateInitPropVo == null) { loanHomeVisitInvestigateInitPropVo = new LoanHomeVisitInvestigateInitPropVo(); loanHomeVisitInvestigateInitPropVo.setMainSid(sid); } @@ -631,25 +631,25 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType()); List location = new ArrayList<>(); - if (dwxxImages != null && dwxxImages.size() > 0){ + if (dwxxImages != null && dwxxImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) { location.add(dwxxImage.getFileUrl()); } @@ -678,7 +678,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType()); List house = new ArrayList<>(); - if (fwzpImages != null && fwzpImages.size() > 0){ + if (fwzpImages != null && fwzpImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) { house.add(fwzpImage.getFileUrl()); } @@ -687,7 +687,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType()); List doorway = new ArrayList<>(); - if (mkzpImages != null && mkzpImages.size() > 0){ + if (mkzpImages != null && mkzpImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) { doorway.add(mkzpImage.getFileUrl()); } @@ -696,7 +696,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType()); List indoor = new ArrayList<>(); - if (ktwszpImages != null && ktwszpImages.size() > 0){ + if (ktwszpImages != null && ktwszpImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) { indoor.add(ktwszpImage.getFileUrl()); } @@ -705,7 +705,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType()); List groupPhoto = new ArrayList<>(); - if (hyzdImages != null && hyzdImages.size() > 0){ + if (hyzdImages != null && hyzdImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) { groupPhoto.add(hyzdImage.getFileUrl()); } @@ -720,7 +720,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -732,7 +731,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -744,7 +742,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -756,7 +753,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -768,7 +764,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -786,7 +781,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType()); List lenderIdCard = new ArrayList<>(); - if (dkrsfzImages != null && dkrsfzImages.size() > 0){ + if (dkrsfzImages != null && dkrsfzImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkrsfzImage : dkrsfzImages) { lenderIdCard.add(dkrsfzImage.getFileUrl()); } @@ -795,7 +790,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType()); List lenderAccount = new ArrayList<>(); - if (dkrhkbImages != null && dkrhkbImages.size() > 0){ + if (dkrhkbImages != null && dkrhkbImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkrhkbImage : dkrhkbImages) { lenderAccount.add(dkrhkbImage.getFileUrl()); } @@ -804,7 +799,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType()); List lenderMarriageCertificate = new ArrayList<>(); - if (dkrhyzmImages != null && dkrhyzmImages.size() > 0){ + if (dkrhyzmImages != null && dkrhyzmImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkrhyzmImage : dkrhyzmImages) { lenderMarriageCertificate.add(dkrhyzmImage.getFileUrl()); } @@ -813,7 +808,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType()); List lenderDriverBook = new ArrayList<>(); - if (dkrjsbImages != null && dkrjsbImages.size() > 0){ + if (dkrjsbImages != null && dkrjsbImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkrjsbImage : dkrjsbImages) { lenderDriverBook.add(dkrjsbImage.getFileUrl()); } @@ -822,7 +817,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType()); List lenderBankStatement = new ArrayList<>(); - if (dkryhlsImages != null && dkryhlsImages.size() > 0){ + if (dkryhlsImages != null && dkryhlsImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dkryhlsImage : dkryhlsImages) { lenderBankStatement.add(dkryhlsImage.getFileUrl()); } @@ -831,7 +826,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); List spouseIdCard = new ArrayList<>(); - if (posfzImages != null && posfzImages.size() > 0){ + if (posfzImages != null && posfzImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo posfzImage : posfzImages) { spouseIdCard.add(posfzImage.getFileUrl()); } @@ -840,7 +835,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); List spouseAccount = new ArrayList<>(); - if (pohkbImages != null && pohkbImages.size() > 0){ + if (pohkbImages != null && pohkbImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo pohkbImage : pohkbImages) { spouseAccount.add(pohkbImage.getFileUrl()); } @@ -849,7 +844,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); List pohkbImage = new ArrayList<>(); - if (dbrsfzImages != null && dbrsfzImages.size() > 0){ + if (dbrsfzImages != null && dbrsfzImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dbrsfzImage : dbrsfzImages) { pohkbImage.add(dbrsfzImage.getFileUrl()); } @@ -858,7 +853,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); List guarantorAccount = new ArrayList<>(); - if (dbrhkbImages != null && dbrhkbImages.size() > 0){ + if (dbrhkbImages != null && dbrhkbImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo dbrhkbImage : dbrhkbImages) { guarantorAccount.add(dbrhkbImage.getFileUrl()); } @@ -873,7 +868,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -885,7 +879,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -897,7 +890,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -909,7 +901,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -921,7 +912,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -933,7 +923,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -945,7 +934,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -957,7 +945,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -969,7 +956,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -987,7 +973,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); List yhkImagess = new ArrayList<>(); - if (yhkImages != null && yhkImages.size() > 0){ + if (yhkImages != null && yhkImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo yhkImage : yhkImages) { yhkImagess.add(yhkImage.getFileUrl()); } @@ -996,7 +982,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType()); List houseProperty = new ArrayList<>(); - if (fcImages != null && fcImages.size() > 0){ + if (fcImages != null && fcImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo fcImage : fcImages) { houseProperty.add(fcImage.getFileUrl()); } @@ -1005,7 +991,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType()); List carProperty = new ArrayList<>(); - if (clImages != null && clImages.size() > 0){ + if (clImages != null && clImages.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo clImage : clImages) { carProperty.add(clImage.getFileUrl()); } @@ -1020,7 +1006,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -1032,7 +1017,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -1044,7 +1028,6 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { @@ -1055,4 +1038,14 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService0){ + return rb.setMsg("贴息抵车款金额不允许超过厂家贴息的金额"); + } if (loanSolutions != null) { baseMapper.deleteByOrderSid(dto.getBusSid()); loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index 9dbeb93bca..dbcfd2ebc4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -539,7 +539,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService> getHomeAppealList(@RequestBody PagerQuery pagerQuery); + /****************************************流程审批******************************************/ @ApiOperation("提交流程") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index 3f0eb42b81..128defb771 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -52,6 +52,11 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei return loanHomeVisitInvestigateService.saveAppointmentInfo(dto); } + @Override + public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { + return loanHomeVisitInvestigateService.saveReportInfo(comment, agree, sid); + } + @Override public ResultBean getHomeVisitReportInfo(String sid) { return loanHomeVisitInvestigateService.getHomeVisitReportInfo(sid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 9a11197fb8..e03b957679 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -52,7 +52,6 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVis import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.anrui.terminal.api.base.common.CarModelVo; -import com.yxt.anrui.terminal.api.risk.creditreview.ShareholderDetailsVo; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery; @@ -130,6 +129,12 @@ public class LoanHomeVisitInvestigateService { return rb.success(); } + public ResultBean saveReportInfo(String comment, Boolean agree, String sid) { + ResultBean rb = ResultBean.fireFail(); + loanHomevisitInvestigateFeign.saveReportInfo(comment,agree,sid); + return rb.success(); + } + public ResultBean getHomeVisitReportInfo(String sid) { ResultBean rb = ResultBean.fireFail(); LoanHomeVisitInvestigateInitReportStateVo data = loanHomevisitInvestigateFeign.getHomeVisitReportInfo(sid).getData();