From a8a9f018ba012a4f82f679c8f86b3cdb442dbffe Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 29 Aug 2023 15:08:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleStateFeign.java | 4 +- .../BaseVehicleStateMapper.java | 2 +- .../BaseVehicleStateMapper.xml | 4 +- .../BaseVehicleStateRest.java | 4 +- .../BaseVehicleStateService.java | 4 +- .../FinBillApplicationDetailsVo.java | 3 + .../FinBillApplicationDto.java | 2 + .../flowable/FinBillCompleteDto.java | 2 + .../api/finbillfile/FinAttachTypeEnum.java | 3 +- .../FinBillApplicationService.java | 17 +- ...oanHomeVisitInvestigateInitCustomerVo.java | 2 - ...anHomeVisitInvestigateSaveCustomerDto.java | 2 - .../LoanHomeVisitInvestigateInitJFJZVo.java | 2 - .../LoanHomeVisitInvestigateInitZCLVo.java | 2 - .../LoanHomeVisitInvestigateInitZMWJVo.java | 2 - .../LoanHomeVisitInvestigateSaveJFJZDto.java | 2 - .../LoanHomeVisitInvestigateSaveZCLDto.java | 2 - .../LoanHomeVisitInvestigateSaveZMWJDto.java | 2 - .../LoanHomeVisitInvestigateInitOperVo.java | 2 - .../LoanHomeVisitInvestigateSaveOperDto.java | 2 - .../LoanHomeVisitInvestigateInitOrderVo.java | 2 - .../LoanHomeVisitInvestigateSaveOrderDto.java | 2 - .../LoanHomeVisitInvestigateInitPropVo.java | 2 - .../LoanHomeVisitInvestigateSavePropDto.java | 2 - .../LoanHomeVisitInvestigateInitTranVo.java | 2 - .../LoanHomeVisitInvestigateSaveTranDto.java | 2 - .../LoanHomevisitInvestigateService.java | 144 ++++-- .../LoanHomevisitInvestigateFileMapper.java | 3 + .../LoanHomevisitInvestigateFileService.java | 486 +++++++++--------- .../advanceInvoice/AdvanceInvoiceDto.java | 2 + .../advanceInvoice/AdvanceInvoiceInfoVo.java | 2 + .../invoiced/BillApplicationIInfoDto.java | 2 + .../invoiced/BillApplicationIInfoVo.java | 2 + .../invoiced/flowable/InvoicedDto.java | 2 + ...oanHomeVisitInvestigateInitCustomerVo.java | 2 - ...AppLoanHomeVisitInvestigateInitJFJZVo.java | 2 - ...AppLoanHomeVisitInvestigateInitOperVo.java | 2 - ...oanHomeVisitInvestigateInitOtherPeoVo.java | 2 - ...AppLoanHomeVisitInvestigateInitPropVo.java | 2 - ...HomeVisitInvestigateInitReportStateVo.java | 2 - ...AppLoanHomeVisitInvestigateInitTranVo.java | 2 - .../AppLoanHomeVisitInvestigateInitZCLVo.java | 2 - ...AppLoanHomeVisitInvestigateInitZMWJVo.java | 2 - ...anHomeVisitInvestigateSaveCustomerDto.java | 2 - ...ppLoanHomeVisitInvestigateSaveJFJZDto.java | 2 - ...ppLoanHomeVisitInvestigateSaveOperDto.java | 2 - ...pLoanHomeVisitInvestigateSaveOrderDto.java | 2 - ...ppLoanHomeVisitInvestigateSavePropDto.java | 2 - ...ppLoanHomeVisitInvestigateSaveTranDto.java | 2 - ...AppLoanHomeVisitInvestigateSaveZCLDto.java | 2 - ...ppLoanHomeVisitInvestigateSaveZMWJDto.java | 2 - .../autoservice/invoiced/InvoicedService.java | 20 + 52 files changed, 407 insertions(+), 367 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java index d00d2f4fed..532affa915 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java @@ -34,7 +34,7 @@ public interface BaseVehicleStateFeign { @ResponseBody ResultBean selectOneQKKPByBusSid(@RequestParam("busSid") String sid); - @PostMapping("selectByVinSid") + @PostMapping("selectByBusSid") @ResponseBody - ResultBean selectByVinSid(@RequestParam("vehSid") String vehSid); + ResultBean selectByBusSid(@RequestParam("busSid") String busSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java index e29f8f8317..4b7f2a9434 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java @@ -22,5 +22,5 @@ public interface BaseVehicleStateMapper extends BaseMapper { BaseVehicleState selectOneQKKPByBusSid(String sid); - BaseVehicleState selectByVinSid(String vehSid); + BaseVehicleState selectByBusSid(String busSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml index 543e03452d..765fd3d718 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.xml @@ -33,10 +33,10 @@ AND busState = '401' - SELECT * FROM base_vehicle_state - WHERE vinSid = #{vehSid} + WHERE busSid = #{busSid} AND carryVehicleState = '0' AND carryInvoiceState = '0' diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java index 380384e418..8b3a6e927e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java @@ -41,8 +41,8 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign { } @Override - public ResultBean selectByVinSid(String vehSid) { - return baseVehicleStateService.selectByVinSid(vehSid); + public ResultBean selectByBusSid(String busSid) { + return baseVehicleStateService.selectByBusSid(busSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index a26c195b9c..a46f405e6a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -188,9 +188,9 @@ public class BaseVehicleStateService extends MybatisBaseService selectByVinSid(String vehSid) { + public ResultBean selectByBusSid(String busSid) { ResultBean rb = ResultBean.fireFail(); - BaseVehicleState baseVehicleState = baseMapper.selectByVinSid(vehSid); + BaseVehicleState baseVehicleState = baseMapper.selectByBusSid(busSid); return rb.success().setData(baseVehicleState); } } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java index 53e9143ed9..e81b2be615 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java @@ -38,6 +38,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -166,6 +167,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple private List fjApplicationAppendxs; @ApiModelProperty("证件") private List zjApplicationAppendxs; // 证件 + @ApiModelProperty("车辆买卖合同附件信息") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List khkpsqsApplicationAppendxs; // 客户开票申请书 @ApiModelProperty("开票信息确认书") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java index 78a97a7414..e05e5e7831 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java @@ -153,6 +153,8 @@ public class FinBillApplicationDto implements Dto { private List finBillVehicles; @ApiModelProperty("开票挂车信息") private List finBillTrailers; + @ApiModelProperty("车辆买卖合同附件信息") + private List carBuyContractImages = new ArrayList<>(); @ApiModelProperty("客户开票申请书附件信息") private List khkpsqsApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("款项确认书附件信息") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java index dc7f4209e1..5b9d45efca 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java @@ -39,6 +39,8 @@ public class FinBillCompleteDto implements Dto { @NotBlank(message = "参数错误：businessSid") private String businessSid; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages = new ArrayList<>(); @ApiModelProperty("客户开票申请书附件信息") private List khkpsqsApplicationAppendxs = new ArrayList<>(); @ApiModelProperty("款项确认书附件信息") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java index 849ef52b2e..df543e8a89 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java @@ -12,7 +12,8 @@ public enum FinAttachTypeEnum { CLDJHT("003", "车辆登记合同"), ZJ("004", "证件"), FJ("005", "附件"), - QKLPFJ("006", "欠款领票附件"); + QKLPFJ("006", "欠款领票附件"), + CLMMHT("007", "车辆买卖合同"); /** * 附件类型 diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 29e7274f42..3aa27c56b9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -385,6 +385,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailers = dto.getFinBillTrailers(); List finBillVehicles = dto.getFinBillVehicles(); + List carBuyContractImages = dto.getCarBuyContractImages(); List khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs(); @@ -2018,7 +2019,8 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicles = dto.getFinBillVehicles(); for (FinBillVehicleDto finBillVehicle : finBillVehicles) { - BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByVinSid(finBillVehicle.getVehSid()).getData(); + BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicle.getVehSid()).getData(); + BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectByBusSid(busSalesOrderVehicle.getSid()).getData(); if (baseVehicleState == null){ return rb.setMsg("车架号" + finBillVehicle.getVinNo() + "已发起过欠款提车或欠款开票，请重新选择"); } @@ -3434,6 +3436,7 @@ public class FinBillApplicationService extends MybatisBaseService carBuyContractImages = query.getCarBuyContractImages(); List khkpsqsApplicationAppendxs = query.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs(); @@ -3475,6 +3478,18 @@ public class FinBillApplicationService extends MybatisBaseService 0) { + for (FinBillFileDto finBillFileDto : carBuyContractImages) { + String filePath = finBillFileDto.getFileUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(businessSid); + finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } if (khkpsqsApplicationAppendxs.size() > 0) { for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java index febf9df69a..0c515c8d3a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateInitCustomerVo.java @@ -68,6 +68,4 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java index 11cf513244..3bbccaab47 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomeVisitInvestigateSaveCustomerDto.java @@ -68,6 +68,4 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java index 9279b82092..89676b2b4b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java @@ -20,6 +20,4 @@ public class LoanHomeVisitInvestigateInitJFJZVo implements Vo { private List indoor; @ApiModelProperty("合影照等") private List groupPhoto; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java index 11d1012db9..6fba20cceb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java @@ -16,6 +16,4 @@ public class LoanHomeVisitInvestigateInitZCLVo implements Vo { private List houseProperty; @ApiModelProperty("车辆") private List carProperty; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java index 9157aecc18..0ed9f74bef 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java @@ -30,6 +30,4 @@ public class LoanHomeVisitInvestigateInitZMWJVo implements Vo { private List guarantorAccount; @ApiModelProperty("是否有配偶") private Boolean spouseState = true; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java index 5f2b14b9af..8257131efc 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveJFJZDto.java @@ -21,6 +21,4 @@ public class LoanHomeVisitInvestigateSaveJFJZDto implements Vo { private List indoor = new ArrayList<>();; @ApiModelProperty("合影照等") private List groupPhoto = new ArrayList<>();; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java index 9a2ac4f324..54dbc80506 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZCLDto.java @@ -16,6 +16,4 @@ public class LoanHomeVisitInvestigateSaveZCLDto implements Vo { private List houseProperty; @ApiModelProperty("车辆") private List carProperty; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java index 93506b9e2a..c4d21dbae9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateSaveZMWJDto.java @@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateSaveZMWJDto implements Vo { private List guarantorIdCard; @ApiModelProperty("担保人户口本") private List guarantorAccount; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java index c89751f3b5..2c32fb310f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java @@ -18,6 +18,4 @@ public class LoanHomeVisitInvestigateInitOperVo implements Vo { private String operationType; @ApiModelProperty("运营方式key") private String operationKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java index 0bebc8f024..baa45040df 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateSaveOperDto.java @@ -18,6 +18,4 @@ public class LoanHomeVisitInvestigateSaveOperDto implements Vo { private String operationType; @ApiModelProperty("运营方式key") private String operationKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java index 5fdeea1df6..dde4da015f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java @@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateInitOrderVo implements Vo { private String paymentRatiokey; @ApiModelProperty("金融首付比例备注") private String paymentRemarks; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java index 964d2d6c35..59fee67654 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateSaveOrderDto.java @@ -28,6 +28,4 @@ public class LoanHomeVisitInvestigateSaveOrderDto implements Vo { private String paymentRatiokey; @ApiModelProperty("金融首付比例备注") private String paymentRemarks; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java index ce0e318a5c..9f93be5e6d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java @@ -36,6 +36,4 @@ public class LoanHomeVisitInvestigateInitPropVo implements Vo { private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java index 16e3f47e1a..1125c0be6a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateSavePropDto.java @@ -36,6 +36,4 @@ public class LoanHomeVisitInvestigateSavePropDto implements Vo { private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java index 93fe236e97..be2dc62b1e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java @@ -38,6 +38,4 @@ public class LoanHomeVisitInvestigateInitTranVo implements Vo { private String income; @ApiModelProperty("净收入") private String netIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java index 96c0129f2b..d0d08205c0 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateSaveTranDto.java @@ -38,6 +38,4 @@ public class LoanHomeVisitInvestigateSaveTranDto implements Vo { private String income; @ApiModelProperty("净收入") private String netIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } 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 6d7efad819..9be0e8c9a6 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 @@ -124,7 +124,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("li.state", query.getType()); - if ("1".equals(query.getType())){ + if ("1".equals(query.getType())) { qw.eq("bb.busNo", 302); } if (StringUtils.isNotBlank(query.getMenuSid())) { @@ -474,7 +474,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos); - loanHomeVisitInvestigateInitCustomerVo.setMainSid(sid); + loanHomeVisitInvestigateInitCustomerVo.setSid(sid); return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo); } public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) { ResultBean rb = ResultBean.fireFail(); - LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto(); List otherPersonnel = dto.getOtherPersonnel(); - BeanUtil.copyProperties(dto, loanHomevisitInvestigateCustomerDto); + LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto(); + LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(dto.getSid()); + if (loanHomevisitInvestigateCustomerDetailsVo == null) { + BeanUtil.copyProperties(dto, loanHomevisitInvestigateCustomerDto, "sid"); + } else { + BeanUtil.copyProperties(loanHomevisitInvestigateCustomerDetailsVo, loanHomevisitInvestigateCustomerDto); + } loanHomevisitInvestigateCustomerDto.setIsConfirmRealBuyer(dto.getActualBuyer()); loanHomevisitInvestigateCustomerDto.setBorrowerSid(dto.getLenderSid()); loanHomevisitInvestigateCustomerDto.setBorrowerName(dto.getLenderNam()); @@ -532,9 +537,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dwxx = dwxx.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -738,9 +768,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { fwzp = fwzp.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -749,9 +780,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { mkzp = mkzp.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -760,9 +792,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { ktwszp = ktwszp.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -771,9 +804,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { hyzd = hyzd.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -868,16 +902,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkrsfz = dkrsfz.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -886,9 +921,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkrhkb = dkrhkb.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -897,9 +933,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkrhyzm = dkrhyzm.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -908,9 +945,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkrjsb = dkrjsb.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -919,9 +957,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dkryhls = dkryhls.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -930,9 +969,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { posfz = posfz.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -941,9 +981,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { pohkb = pohkb.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -952,9 +993,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dbrsfz = dbrsfz.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -963,9 +1005,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { dbrhkb = dbrhkb.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1006,16 +1049,17 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { yhk = yhk.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1024,9 +1068,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { fc = fc.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1035,9 +1080,10 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService -1) { cl = cl.replace(fileUploadComponent.getUrlPrefix(), ""); @@ -1051,7 +1097,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService yhkImages = new ArrayList<>(); List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); - if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0){ + if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) { for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { yhkImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); } } financeForm12.setFiles(yhkImages); userInfo.add(financeForm12); - if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())){ + if ("0004".equals(loanHomevisitInvestigateCustomerDetailsVo.getMaritalStatusKey())) { FinanceForm financeForm13 = new FinanceForm(); financeForm13.setValue("配偶"); financeForm13.setSpanSize(2); @@ -1153,7 +1199,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); - if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0){ + if (loanHomeVisitInvestigateInitOtherPeoVos != null && loanHomeVisitInvestigateInitOtherPeoVos.size() > 0) { FinanceForm financeForm20 = new FinanceForm(); financeForm20.setValue("其他人员"); financeForm20.setSpanSize(2); @@ -1272,7 +1318,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService zCInfo = new ArrayList<>(); - if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()){ + if (loanHomevisitInvestigatePropertyDetailsVo.getIsRealEstate()) { FinanceForm financeForm43 = new FinanceForm(); financeForm43.setValue("房产"); financeForm43.setSpanSize(2); @@ -1281,11 +1327,11 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; + @Autowired + private FileUploadComponent fileUploadComponent; - private QueryWrapper createQueryWrapper(LoanHomevisitInvestigateFileQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - LoanHomevisitInvestigateFileQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(LoanHomevisitInvestigateFileDto dto){ + private QueryWrapper createQueryWrapper(LoanHomevisitInvestigateFileQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + LoanHomevisitInvestigateFileQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(LoanHomevisitInvestigateFileDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(LoanHomevisitInvestigateFileDto dto){ - LoanHomevisitInvestigateFile entity = new LoanHomevisitInvestigateFile(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(LoanHomevisitInvestigateFileDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(LoanHomevisitInvestigateFileDto dto) { + LoanHomevisitInvestigateFile entity = new LoanHomevisitInvestigateFile(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(LoanHomevisitInvestigateFileDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - LoanHomevisitInvestigateFile entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public LoanHomevisitInvestigateFileDetailsVo fetchDetailsVoBySid(String sid){ - LoanHomevisitInvestigateFile entity = fetchBySid(sid); - LoanHomevisitInvestigateFileDetailsVo vo = new LoanHomevisitInvestigateFileDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + } + LoanHomevisitInvestigateFile entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public LoanHomevisitInvestigateFileDetailsVo fetchDetailsVoBySid(String sid) { + LoanHomevisitInvestigateFile entity = fetchBySid(sid); + LoanHomevisitInvestigateFileDetailsVo vo = new LoanHomevisitInvestigateFileDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public ResultBean saveOrUpdateAllDto(LoanHomevisitInvestigateFileAllDto dto) { + ResultBean rb = ResultBean.fireFail(); + //定位信息 + for (String dwxxImage : dto.getDwxxImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dwxxImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dwxxImage = dwxxImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dwxxImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //房屋照片 + for (String fwzpImage : dto.getFwzpImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (fwzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + fwzpImage = fwzpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(fwzpImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //门口照片 + for (String mkzpImage : dto.getMkzpImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (mkzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + mkzpImage = mkzpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(mkzpImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //客厅卧室照片 + for (String ktwszpImage : dto.getKtwszpImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (ktwszpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + ktwszpImage = ktwszpImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(ktwszpImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //合影照等 + for (String hyzdImage : dto.getHyzdImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (hyzdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + hyzdImage = hyzdImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(hyzdImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人身份证 + for (String dkrsfzImage : dto.getDkrsfzImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrsfzImage = dkrsfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrsfzImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人户口本 + for (String dkrhkbImage : dto.getDkrhkbImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrhkbImage = dkrhkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrhkbImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人婚姻证明 + for (String dkrhyzmImage : dto.getDkrhyzmImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkrhyzmImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrhyzmImage = dkrhyzmImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzmImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人驾驶本 + for (String dkrjsbImage : dto.getDkrjsbImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkrjsbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkrjsbImage = dkrjsbImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkrjsbImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //贷款人银行流水 + for (String dkryhlsImage : dto.getDkryhlsImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dkryhlsImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dkryhlsImage = dkryhlsImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dkryhlsImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //配偶身份证 + for (String posfzImage : dto.getPosfzImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (posfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + posfzImage = posfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(posfzImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //配偶户口本 + for (String pohkbImage : dto.getPohkbImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (pohkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + pohkbImage = pohkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(pohkbImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //担保人身份证 + for (String dbrsfzImage : dto.getDbrsfzImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dbrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dbrsfzImage = dbrsfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dbrsfzImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //担保人户口本 + for (String dbrhkbImage : dto.getDbrhkbImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (dbrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + dbrhkbImage = dbrhkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(dbrhkbImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //银行卡 + for (String yhkImage : dto.getYhkImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //房产 + for (String fcImage : dto.getFcImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (fcImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + fcImage = fcImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(fcImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + //车辆 + for (String clImage : dto.getClImages()) { + LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); + if (clImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + clImage = clImage.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanHomevisitInvestigateFileDto.setFileUrl(clImage); + loanHomevisitInvestigateFileDto.setSid(dto.getSid()); + loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType()); + saveOrUpdateDto(loanHomevisitInvestigateFileDto); + } + return rb.success(); + } - public ResultBean saveOrUpdateAllDto(LoanHomevisitInvestigateFileAllDto dto) { - ResultBean rb = ResultBean.fireFail(); - //定位信息 - for (String dwxxImage : dto.getDwxxImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dwxxImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dwxxImage = dwxxImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dwxxImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DWXX.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //房屋照片 - for (String fwzpImage : dto.getFwzpImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (fwzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - fwzpImage = fwzpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(fwzpImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FWZP.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //门口照片 - for (String mkzpImage : dto.getMkzpImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (mkzpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - mkzpImage = mkzpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(mkzpImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.MKZP.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //客厅卧室照片 - for (String ktwszpImage : dto.getKtwszpImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (ktwszpImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - ktwszpImage = ktwszpImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(ktwszpImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.KTWSZP.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //合影照等 - for (String hyzdImage : dto.getHyzdImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (hyzdImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - hyzdImage = hyzdImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(hyzdImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.HYZD.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人身份证 - for (String dkrsfzImage : dto.getDkrsfzImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkrsfzImage = dkrsfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkrsfzImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRSFZ.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人户口本 - for (String dkrhkbImage : dto.getDkrhkbImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkrhkbImage = dkrhkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkrhkbImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHKB.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人婚姻证明 - for (String dkrhyzmImage : dto.getDkrhyzmImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkrhyzmImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkrhyzmImage = dkrhyzmImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkrhyzmImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRHYZM.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人驾驶本 - for (String dkrjsbImage : dto.getDkrjsbImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkrjsbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkrjsbImage = dkrjsbImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkrjsbImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRJSB.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //贷款人银行流水 - for (String dkryhlsImage : dto.getDkryhlsImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dkryhlsImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dkryhlsImage = dkryhlsImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dkryhlsImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DKRYHLS.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //配偶身份证 - for (String posfzImage : dto.getPosfzImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (posfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - posfzImage = posfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(posfzImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POSFZ.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //配偶户口本 - for (String pohkbImage : dto.getPohkbImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (pohkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - pohkbImage = pohkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(pohkbImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.POHKB.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //担保人身份证 - for (String dbrsfzImage : dto.getDbrsfzImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dbrsfzImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dbrsfzImage = dbrsfzImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dbrsfzImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRSFZ.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //担保人户口本 - for (String dbrhkbImage : dto.getDbrhkbImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (dbrhkbImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - dbrhkbImage = dbrhkbImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(dbrhkbImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.DBRHKB.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //银行卡 - for (String yhkImage : dto.getYhkImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (yhkImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - yhkImage = yhkImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(yhkImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.YHK.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //房产 - for (String fcImage : dto.getFcImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (fcImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - fcImage = fcImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(fcImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.FC.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - //车辆 - for (String clImage : dto.getClImages()) { - LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto(); - if (clImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { - clImage = clImage.replace(fileUploadComponent.getUrlPrefix(), ""); - } - loanHomevisitInvestigateFileDto.setFileUrl(clImage); - loanHomevisitInvestigateFileDto.setSid(dto.getSid()); - loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.CL.getAttachType()); - saveOrUpdateDto(loanHomevisitInvestigateFileDto); - } - return rb.success(); - } + public List selByMainSidAndTypeKey(String sid, String attachType) { + return baseMapper.selByMainSidAndTypeKey(sid, attachType, fileUploadComponent.getUrlPrefix()); + } - public List selByMainSidAndTypeKey(String sid, String attachType) { - return baseMapper.selByMainSidAndTypeKey(sid,attachType,fileUploadComponent.getUrlPrefix()); - } + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public void delByMainSidAndType(String dtoSid, String type) { + baseMapper.delByMainSidAndType(dtoSid, type); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java index ffbc7b5840..35afd35fbc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java @@ -57,6 +57,8 @@ public class AdvanceInvoiceDto implements Dto { private List fjApplicationAppendxs; @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java index 5fbcdb8b05..5f6a43492d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java @@ -62,6 +62,8 @@ public class AdvanceInvoiceInfoVo implements Vo { private List fjApplicationAppendxs; @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java index 495054a619..9bb38f8354 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoDto.java @@ -51,6 +51,8 @@ public class BillApplicationIInfoDto implements Dto { private List finBillTrailers; // 开票挂车信息 @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java index d21c65fdad..cb929f2d28 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/BillApplicationIInfoVo.java @@ -51,6 +51,8 @@ public class BillApplicationIInfoVo implements Vo { private List finBillTrailers; // 开票挂车信息 @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java index 5e9aa9d6ec..286a1f54e5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/flowable/InvoicedDto.java @@ -38,6 +38,8 @@ public class InvoicedDto implements Dto { @ApiModelProperty("证件") private List idCardImages; + @ApiModelProperty("车辆买卖合同") + private List carBuyContractImages; @ApiModelProperty("客户开票申请书") private List customerInvoiceApplyImages; @ApiModelProperty("车辆登记合同") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java index 126876bf60..f5aa72fed4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java @@ -66,6 +66,4 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java index 56c0f3e1f0..c54ebfd2ba 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java @@ -20,6 +20,4 @@ public class AppLoanHomeVisitInvestigateInitJFJZVo implements Vo { private List indoor; @ApiModelProperty("合影照等") private List groupPhoto; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java index 613052d35c..c367c9d900 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java @@ -18,6 +18,4 @@ public class AppLoanHomeVisitInvestigateInitOperVo implements Vo { private String operationType; @ApiModelProperty("运营方式key") private String operationKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java index 8418441037..1fe00f91b4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java @@ -26,6 +26,4 @@ public class AppLoanHomeVisitInvestigateInitOtherPeoVo implements Vo { private String company; @ApiModelProperty("职业") private String job; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java index 96e4f4c48c..b13b800618 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java @@ -36,6 +36,4 @@ public class AppLoanHomeVisitInvestigateInitPropVo implements Vo { private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java index 866aa48681..b585dcb6c4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java @@ -17,6 +17,4 @@ public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo { private String transportState; @ApiModelProperty("资产情况") private String assetsState; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java index fb19fda477..67233d4d7a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java @@ -38,6 +38,4 @@ public class AppLoanHomeVisitInvestigateInitTranVo implements Vo { private String income; @ApiModelProperty("净收入") private String netIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java index 4ed58adfce..9cd19c1b16 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java @@ -16,6 +16,4 @@ public class AppLoanHomeVisitInvestigateInitZCLVo implements Vo { private List houseProperty; @ApiModelProperty("车辆") private List carProperty; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java index 10e71b6a7e..67329aeff4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java @@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateInitZMWJVo implements Vo { private List guarantorIdCard; @ApiModelProperty("担保人户口本") private List guarantorAccount; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java index 3874859d69..c79bfe89af 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java @@ -67,6 +67,4 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto { private String emergencyContactType; @ApiModelProperty("紧急联系人类型key") private String emergencyContactTypeKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java index acaac42f3a..6c8a6d2327 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveJFJZDto.java @@ -20,6 +20,4 @@ public class AppLoanHomeVisitInvestigateSaveJFJZDto implements Vo { private List indoor; @ApiModelProperty("合影照等") private List groupPhoto; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java index d7371d2f0c..0ab64c8f7a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOperDto.java @@ -18,6 +18,4 @@ public class AppLoanHomeVisitInvestigateSaveOperDto implements Vo { private String operationType; @ApiModelProperty("运营方式key") private String operationKey; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java index 6eff82637f..3ff300831d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOrderDto.java @@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateSaveOrderDto implements Vo { private String paymentRatiokey; @ApiModelProperty("金融首付比例备注") private String paymentRemarks; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java index 75c8e84e27..8fad74b47d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSavePropDto.java @@ -36,6 +36,4 @@ public class AppLoanHomeVisitInvestigateSavePropDto implements Vo { private String otherIncomeKey; @ApiModelProperty("其他收入来源") private String otherIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java index 3df43cea0d..38a1e7b17a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveTranDto.java @@ -38,6 +38,4 @@ public class AppLoanHomeVisitInvestigateSaveTranDto implements Vo { private String income; @ApiModelProperty("净收入") private String netIncome; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java index 8bd14c37eb..d43a9c2f74 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZCLDto.java @@ -16,6 +16,4 @@ public class AppLoanHomeVisitInvestigateSaveZCLDto implements Vo { private List houseProperty; @ApiModelProperty("车辆") private List carProperty; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java index b87b8cef94..aef5078e30 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveZMWJDto.java @@ -28,6 +28,4 @@ public class AppLoanHomeVisitInvestigateSaveZMWJDto implements Vo { private List guarantorIdCard; @ApiModelProperty("担保人户口本") private List guarantorAccount; - @ApiModelProperty("家访考察表sid") - private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 2e857a47ce..02a3d17c71 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -255,14 +255,23 @@ public class InvoicedService { } finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); //附件信息 + List appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同 List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 + List carBuyContractImages = new ArrayList<>(); // 车辆买卖合同 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 + if (appCarBuyContractImages != null){ + for (String appCarBuyContractImage : appCarBuyContractImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(appCarBuyContractImage); + carBuyContractImages.add(finBillFileDto); + } + } if (customerInvoiceApplyImages != null){ for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); @@ -291,6 +300,7 @@ public class InvoicedService { idCardImagesPC.add(finBillFileDto); } } + finBillApplicationDto.setCarBuyContractImages(carBuyContractImages); finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); @@ -485,14 +495,23 @@ public class InvoicedService { BeanUtil.copyProperties(dto, finBillCompleteDto); finBillCompleteDto.setOrgSidPath(dto.getOrgPath()); //附件信息 + List appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同 List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 + List carBuyContractImages = new ArrayList<>(); // 车辆买卖合同 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 + if (appCarBuyContractImages != null){ + for (String appCarBuyContractImage : appCarBuyContractImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(appCarBuyContractImage); + carBuyContractImages.add(finBillFileDto); + } + } if (customerInvoiceApplyImages != null){ for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); @@ -521,6 +540,7 @@ public class InvoicedService { idCardImagesPC.add(finBillFileDto); } } + finBillCompleteDto.setCarBuyContractImages(carBuyContractImages); finBillCompleteDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); finBillCompleteDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); finBillCompleteDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); From 4983bfe460097797f721c75d78a4f191e01cd8e1 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 29 Aug 2023 16:53:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=B6=E8=AE=BF=E3=80=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillApplicationService.java | 30 ++++++ .../biz/finbillfile/FinBillFileMapper.java | 3 + .../biz/finbillfile/FinBillFileService.java | 4 + .../autoservice/invoiced/InvoicedService.java | 98 ++++++++++++------- 4 files changed, 102 insertions(+), 33 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 3aa27c56b9..6b62297cd0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -416,6 +416,16 @@ public class FinBillApplicationService extends MybatisBaseService -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -466,6 +476,18 @@ public class FinBillApplicationService extends MybatisBaseService -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + finBillFileDto.setFileUrl(filePath); + finBillFileDto.setBillAppSid(finBillApplication.getSid()); + finBillFileDto.setAttachType(FinAttachTypeEnum.CLMMHT.getAttachType()); + finBillFileService.saveOrUpdateDto(finBillFileDto); + } + } if (khkpsqsApplicationAppendxs != null) { for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); @@ -599,6 +621,13 @@ public class FinBillApplicationService extends MybatisBaseService clmmhtApplicationAppendxs = finBillFileService.fetchclmmhtBySid(sid); + for (FinBillFileVo clmmhtApplicationAppendx : clmmhtApplicationAppendxs) { + String fileUrl = clmmhtApplicationAppendx.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + fileUrl = urlPrefix + fileUrl; + clmmhtApplicationAppendx.setFileUrl(fileUrl); + } List khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid); for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { String fileUrl = khkpsqsApplicationAppendx.getFileUrl(); @@ -641,6 +670,7 @@ public class FinBillApplicationService extends MybatisBaseService { @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '006'") List fetchqklpfjBySid(String sid); + @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '007'") + List fetchclmmhtBySid(String sid); + List fetchFileByBillSid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java index 9ba5589ee6..6aeb138e39 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java @@ -173,4 +173,8 @@ public class FinBillFileService extends MybatisBaseService fetchqklpfjBySid(String sid) { return baseMapper.fetchqklpfjBySid(sid); } + + public List fetchclmmhtBySid(String sid) { + return baseMapper.fetchclmmhtBySid(sid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index 02a3d17c71..38873e946f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -76,9 +76,9 @@ public class InvoicedService { billApplicationPageVo.setSid(record.getSid()); billApplicationPageVo.setBillState(record.getBillStateValue()); billApplicationPageVo.setNodeState(record.getNodeState()); - if (record.getNodeState().equals("待提交")){ + if (record.getNodeState().equals("待提交")) { billApplicationPageVo.setShowUpData(true); - }else { + } else { billApplicationPageVo.setShowUpData(false); } billApplicationPageVo.setVinNo(record.getVinNo()); @@ -140,10 +140,10 @@ public class InvoicedService { //挂车信息 List finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers(); List finBillTrailerVos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) { FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); - BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo); + BeanUtil.copyProperties(finBillTrailer, finBillTrailerVo); List hgzImageUrl = finBillTrailer.getHgzImageUrl(); finBillTrailerVo.setFiles(hgzImageUrl); finBillTrailerVo.setOneBillMoney(finBillTrailer.getOneBillMoney()); @@ -152,43 +152,51 @@ public class InvoicedService { } vo.setFinBillTrailers(finBillTrailerVos); //附件信息 + List carBuyContractImages = finBillApplicationDetailsVo.getCarBuyContractImages(); List khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); + List appCarBuyContractImages = new ArrayList<>();//客户开票申请书 List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 List idCardImages = new ArrayList<>(); - if (zjApplicationAppendxs.size() > 0){ + if (carBuyContractImages.size() > 0) { + for (FinBillFileVo carBuyContractImage : carBuyContractImages) { + appCarBuyContractImages.add(carBuyContractImage.getFileUrl()); + } + } + if (zjApplicationAppendxs.size() > 0) { for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { idCardImages.add(zjApplicationAppendx.getFileUrl()); } } - if (khkpsqsApplicationAppendxs.size() > 0){ + if (khkpsqsApplicationAppendxs.size() > 0) { for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); } } - if (kpxxqrsApplicationAppendxs.size() > 0){ + if (kpxxqrsApplicationAppendxs.size() > 0) { for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } } - if (cldjhtApplicationAppendxs.size() > 0){ + if (cldjhtApplicationAppendxs.size() > 0) { for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); } } + vo.setCarBuyContractImages(appCarBuyContractImages); vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); vo.setRegisterContractImages(registerContractImages); vo.setIdCardImages(idCardImages); BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); - if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) { vo.setIsCanEdit(false); vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); - }else { + } else { vo.setIsCanEdit(true); } return rb.success().setData(vo); @@ -196,7 +204,7 @@ public class InvoicedService { public ResultBean saveInvoicedApplyInfo(BillApplicationIInfoDto dto) { FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto(); - BeanUtil.copyProperties(dto, finBillApplicationDto); + BeanUtil.copyProperties(dto, finBillApplicationDto, "carBuyContractImages"); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); finBillApplicationDto.setUseOrgSid(useOrgSid); finBillApplicationDto.setCreateBySid(dto.getUserSid()); @@ -227,7 +235,7 @@ public class InvoicedService { List vinList = dto.getVinList(); List finBillVehicleDtos = new ArrayList<>(); for (VinListDto vinListDto : vinList) { - if (StringUtils.isBlank(vinListDto.getInvoiceInfo())){ + if (StringUtils.isBlank(vinListDto.getInvoiceInfo())) { return new ResultBean().fail().setMsg("开票信息不能为空"); } FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); @@ -246,7 +254,7 @@ public class InvoicedService { //开票挂车信息 List finBillTrailers = dto.getFinBillTrailers(); List finBillTrailerDtos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (FinBillTrailerDto finBillTrailer : finBillTrailers) { com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); @@ -265,35 +273,35 @@ public class InvoicedService { List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - if (appCarBuyContractImages != null){ + if (appCarBuyContractImages != null) { for (String appCarBuyContractImage : appCarBuyContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(appCarBuyContractImage); carBuyContractImages.add(finBillFileDto); } } - if (customerInvoiceApplyImages != null){ + if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(customerInvoiceApplyImage); khkpsqsApplicationAppendxs.add(finBillFileDto); } } - if (invoiceApplyConfirmImages != null){ + if (invoiceApplyConfirmImages != null) { for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(invoiceApplyConfirmImage); kpxxqrsApplicationAppendxs.add(finBillFileDto); } } - if (registerContractImages != null){ + if (registerContractImages != null) { for (String registerContractImage : registerContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(registerContractImage); cldjhtApplicationAppendxs.add(finBillFileDto); } } - if (idCardImages != null){ + if (idCardImages != null) { for (String idCardImage : idCardImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(idCardImage); @@ -386,7 +394,7 @@ public class InvoicedService { public ResultBean submitInvoicedInfo(SubmitInvoicedInfoDto dto) { ResultBean rb = ResultBean.fireFail(); SubmitFinBillApplicationDto submitBillApplicationDto = new SubmitFinBillApplicationDto(); - BeanUtil.copyProperties(dto, submitBillApplicationDto); + BeanUtil.copyProperties(dto, submitBillApplicationDto, "carBuyContractImages"); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); submitBillApplicationDto.setUseOrgSid(useOrgSid); submitBillApplicationDto.setCreateBySid(dto.getUserSid()); @@ -433,7 +441,7 @@ public class InvoicedService { //开票挂车信息 List finBillTrailers = dto.getFinBillTrailers(); List finBillTrailerDtos = new ArrayList<>(); - if (finBillTrailers != null && finBillTrailers.size() > 0){ + if (finBillTrailers != null && finBillTrailers.size() > 0) { for (FinBillTrailerDto finBillTrailer : finBillTrailers) { com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto finBillTrailerDto = new com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto(); BeanUtil.copyProperties(finBillTrailer, finBillTrailerDto); @@ -442,42 +450,52 @@ public class InvoicedService { } submitBillApplicationDto.setFinBillTrailers(finBillTrailerDtos); //附件信息 + List appCarBuyContractImages = dto.getCarBuyContractImages();//车辆买卖合同 List customerInvoiceApplyImages = dto.getCustomerInvoiceApplyImages();//客户开票申请书 List invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书 List registerContractImages = dto.getRegisterContractImages();//车辆登记合同 List idCardImages = dto.getIdCardImages();//证件 + List carBuyContractImages = new ArrayList<>(); // 车辆买卖合同 List khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息 List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - if (customerInvoiceApplyImages != null){ + if (appCarBuyContractImages != null) { + for (String appCarBuyContractImage : appCarBuyContractImages) { + FinBillFileDto finBillFileDto = new FinBillFileDto(); + finBillFileDto.setFileUrl(appCarBuyContractImage); + carBuyContractImages.add(finBillFileDto); + } + } + if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(customerInvoiceApplyImage); khkpsqsApplicationAppendxs.add(finBillFileDto); } } - if (invoiceApplyConfirmImages != null){ + if (invoiceApplyConfirmImages != null) { for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(invoiceApplyConfirmImage); kpxxqrsApplicationAppendxs.add(finBillFileDto); } } - if (registerContractImages != null){ + if (registerContractImages != null) { for (String registerContractImage : registerContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(registerContractImage); cldjhtApplicationAppendxs.add(finBillFileDto); } } - if (idCardImages != null){ + if (idCardImages != null) { for (String idCardImage : idCardImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(idCardImage); idCardImagesPC.add(finBillFileDto); } } + submitBillApplicationDto.setCarBuyContractImages(carBuyContractImages); submitBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs); submitBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs); submitBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs); @@ -505,35 +523,35 @@ public class InvoicedService { List kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息 List cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息 List idCardImagesPC = new ArrayList<>();//证件 - if (appCarBuyContractImages != null){ + if (appCarBuyContractImages != null) { for (String appCarBuyContractImage : appCarBuyContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(appCarBuyContractImage); carBuyContractImages.add(finBillFileDto); } } - if (customerInvoiceApplyImages != null){ + if (customerInvoiceApplyImages != null) { for (String customerInvoiceApplyImage : customerInvoiceApplyImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(customerInvoiceApplyImage); khkpsqsApplicationAppendxs.add(finBillFileDto); } } - if (invoiceApplyConfirmImages != null){ + if (invoiceApplyConfirmImages != null) { for (String invoiceApplyConfirmImage : invoiceApplyConfirmImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(invoiceApplyConfirmImage); kpxxqrsApplicationAppendxs.add(finBillFileDto); } } - if (registerContractImages != null){ + if (registerContractImages != null) { for (String registerContractImage : registerContractImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(registerContractImage); cldjhtApplicationAppendxs.add(finBillFileDto); } } - if (idCardImages != null){ + if (idCardImages != null) { for (String idCardImage : idCardImages) { FinBillFileDto finBillFileDto = new FinBillFileDto(); finBillFileDto.setFileUrl(idCardImage); @@ -575,10 +593,12 @@ public class InvoicedService { FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); if (finBillApplicationDetailsVo != null) { //附件信息 + List carBuyContractImages = finBillApplicationDetailsVo.getCarBuyContractImages(); List khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); + List appCarBuyContractImages = new ArrayList<>(); List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 List registerContractImages = new ArrayList<>();//车辆登记合同 @@ -596,7 +616,19 @@ public class InvoicedService { itemEditTextInfo.setFilesPath(idCardImages); itemEditTextInfos.add(itemEditTextInfo); } - if (khkpsqsApplicationAppendxs != null) { + if (carBuyContractImages != null) { + for (FinBillFileVo carBuyContractImage : carBuyContractImages) { + appCarBuyContractImages.add(carBuyContractImage.getFileUrl()); + } + ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo(); + itemEditTextInfo.setTitle("车辆买卖合同"); + itemEditTextInfo.setType(1); + itemEditTextInfo.setNullAble(false); + itemEditTextInfo.setKey("carBuyContractImages"); + itemEditTextInfo.setFilesPath(appCarBuyContractImages); + itemEditTextInfos.add(itemEditTextInfo); + } + /*if (khkpsqsApplicationAppendxs != null) { for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); } @@ -607,8 +639,8 @@ public class InvoicedService { itemEditTextInfo.setKey("customerInvoiceApplyImages"); itemEditTextInfo.setFilesPath(customerInvoiceApplyImages); itemEditTextInfos.add(itemEditTextInfo); - } - if (kpxxqrsApplicationAppendxs != null) { + }*/ + /*if (kpxxqrsApplicationAppendxs != null) { for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); } @@ -619,7 +651,7 @@ public class InvoicedService { itemEditTextInfo.setKey("invoiceApplyConfirmImages"); itemEditTextInfo.setFilesPath(invoiceApplyConfirmImages); itemEditTextInfos.add(itemEditTextInfo); - } + }*/ if (cldjhtApplicationAppendxs != null) { for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());