From 9fefe239cb156ac5b988f025406b0e6f028cfa36 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 15 Aug 2023 10:24:21 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oanHomeVisitInvestigateInitCustomerVo.java | 65 ++++++++++++++++++ ...anHomeVisitInvestigateSaveCustomerDto.java | 67 +++++++++++++++++++ .../LoanHomevisitInvestigateFeign.java | 10 +++ .../LoanHomevisitInvestigateCustomer.java | 2 +- ...HomevisitInvestigateCustomerDetailsVo.java | 2 +- .../LoanHomevisitInvestigateCustomerDto.java | 2 +- ...LoanHomevisitInvestigateCustomerQuery.java | 2 +- .../LoanHomevisitInvestigateCustomerVo.java | 2 +- ...oanHomeVisitInvestigateInitOtherPeoVo.java | 27 ++++++++ .../LoanHomevisitInvestigateMapper.java | 3 + .../LoanHomevisitInvestigateMapper.xml | 30 +++++++++ .../LoanHomevisitInvestigateRest.java | 10 +++ .../LoanHomevisitInvestigateService.java | 54 +++++++++++++++ .../LoanHomevisitInvestigateFileMapper.java | 21 +++--- .../LoanHomevisitInvestigateFileMapper.xml | 38 ++++++++--- .../LoanHomevisitInvestigateFileService.java | 2 +- ...oanHomevisitInvestigateOtherpeoMapper.java | 4 ++ ...LoanHomevisitInvestigateOtherpeoMapper.xml | 40 ++++++++--- ...anHomevisitInvestigateOtherpeoService.java | 11 ++- ...oanHomeVisitInvestigateInitCustomerVo.java | 63 +++++++++++++++++ ...oanHomeVisitInvestigateInitOtherPeoVo.java | 27 ++++++++ ...anHomeVisitInvestigateSaveCustomerDto.java | 64 ++++++++++++++++++ .../LoanHomeVisitInvestigateFeign.java | 10 +++ .../LoanHomeVisitInvestigateRest.java | 10 +++ .../LoanHomeVisitInvestigateService.java | 16 +++++ 25 files changed, 541 insertions(+), 41 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java new file mode 100644 index 0000000000..429e7f659f --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java @@ -0,0 +1,65 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; + +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateInitCustomerVo implements Vo { + + private String sid; + @ApiModelProperty("实际购车人") + private Boolean actualBuyer; + @ApiModelProperty("借款人sid") + private String lenderSid; + @ApiModelProperty("借款人姓名") + private String lenderNam; + @ApiModelProperty("身份证") + private String idNumber; + @ApiModelProperty("电话") + private String mobile; + @ApiModelProperty("职业value") + private String lenderJob; + @ApiModelProperty("职业key") + private String lenderJobKey; + @ApiModelProperty("婚姻状况value") + private String marriageType; + @ApiModelProperty("婚姻状况key") + private String marriageTypeKey; + @ApiModelProperty("是否有子女value") + private String children; + @ApiModelProperty("是否有子女key") + private String childrenKey; + @ApiModelProperty("户籍地址") + private String koseki; + @ApiModelProperty("现居住地址") + private String address; + @ApiModelProperty("开户行") + private String invoBank; + @ApiModelProperty("银行账号") + private String bankNumber; + @ApiModelProperty("银行卡照片") + private List bankCardImages = new ArrayList<>(); + @ApiModelProperty("配偶姓名") + private String spouseName; + @ApiModelProperty("配偶身份证") + private String spouseIdCard; + @ApiModelProperty("配偶电话") + private String spouseMobile; + @ApiModelProperty("配偶职业") + private String spouseJob; + @ApiModelProperty("其他人员") + private List otherPersonnel = new ArrayList<>(); + @ApiModelProperty("紧急联系人姓名") + private String emergencyContactName; + @ApiModelProperty("紧急联系人电话") + private String emergencyContactMobile; + @ApiModelProperty("紧急联系人类型value") + private String emergencyContactType; + @ApiModelProperty("紧急联系人类型key") + private String emergencyContactTypeKey; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java new file mode 100644 index 0000000000..3f1be16747 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java @@ -0,0 +1,67 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; + +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto { + + private String sid; + @ApiModelProperty("实际购车人") + private Boolean actualBuyer; + @ApiModelProperty("借款人sid") + private String lenderSid; + @ApiModelProperty("借款人姓名") + private String lenderNam; + @ApiModelProperty("身份证") + private String idNumber; + @ApiModelProperty("电话") + private String mobile; + @ApiModelProperty("职业value") + private String lenderJob; + @ApiModelProperty("职业key") + private String lenderJobKey; + @ApiModelProperty("婚姻状况value") + private String marriageType; + @ApiModelProperty("婚姻状况key") + private String marriageTypeKey; + @ApiModelProperty("是否有子女value") + private String children; + @ApiModelProperty("是否有子女key") + private String childrenKey; + @ApiModelProperty("户籍地址") + private String koseki; + @ApiModelProperty("现居住地址") + private String address; + @ApiModelProperty("开户行") + private String invoBank; + @ApiModelProperty("银行账号") + private String bankNumber; + @ApiModelProperty("银行卡照片") + private List bankCardImages = new ArrayList<>(); + @ApiModelProperty("配偶姓名") + private String spouseName; + @ApiModelProperty("配偶身份证") + private String spouseIdCard; + @ApiModelProperty("配偶电话") + private String spouseMobile; + @ApiModelProperty("配偶职业") + private String spouseJob; + @ApiModelProperty("其他人员") + private List otherPersonnel = new ArrayList<>(); + @ApiModelProperty("紧急联系人姓名") + private String emergencyContactName; + @ApiModelProperty("紧急联系人电话") + private String emergencyContactMobile; + @ApiModelProperty("紧急联系人类型value") + 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/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index c90c1c21f4..0e23e93102 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -95,4 +95,14 @@ public interface LoanHomevisitInvestigateFeign { @GetMapping("/getHomeVisitDataInfo") @ResponseBody public ResultBean getHomeVisitDataInfo(@RequestParam("sid") String sid); + + @ApiOperation("初始化家访考察客户信息") + @GetMapping("/getHomeVisitCustomerInfo") + @ResponseBody + public ResultBean getHomeVisitCustomerInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察客户信息") + @PostMapping("/saveHomeVisitCustomerInfo") + @ResponseBody + public ResultBean saveHomeVisitCustomerInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveCustomerDto dto); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomer.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomer.java index 5425dc958f..f35a58659e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomer.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomer.java @@ -51,7 +51,7 @@ public class LoanHomevisitInvestigateCustomer extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("是否为实际购车人") - private String isConfirmRealBuyer; // 是否为实际购车人 + private Boolean isConfirmRealBuyer; // 是否为实际购车人 @ApiModelProperty("借款人sid") private String borrowerSid; // 借款人sid @ApiModelProperty("借款人姓名") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java index 553620c7cf..4556a69dac 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDetailsVo.java @@ -52,7 +52,7 @@ public class LoanHomevisitInvestigateCustomerDetailsVo implements Vo { private String sid; // sid @ApiModelProperty("是否为实际购车人") - private String isConfirmRealBuyer; // 是否为实际购车人 + private Boolean isConfirmRealBuyer; // 是否为实际购车人 @ApiModelProperty("借款人sid") private String borrowerSid; // 借款人sid @ApiModelProperty("借款人姓名") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDto.java index c8252d07a9..8b3c0af09b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerDto.java @@ -52,7 +52,7 @@ public class LoanHomevisitInvestigateCustomerDto implements Dto { private String sid; // sid @ApiModelProperty("是否为实际购车人") - private String isConfirmRealBuyer; // 是否为实际购车人 + private Boolean isConfirmRealBuyer; // 是否为实际购车人 @ApiModelProperty("借款人sid") private String borrowerSid; // 借款人sid @ApiModelProperty("借款人姓名") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerQuery.java index 70bcea82a8..44e903a851 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerQuery.java @@ -50,7 +50,7 @@ import lombok.Data; public class LoanHomevisitInvestigateCustomerQuery implements Query { @ApiModelProperty("是否为实际购车人") - private String isConfirmRealBuyer; // 是否为实际购车人 + private Boolean isConfirmRealBuyer; // 是否为实际购车人 @ApiModelProperty("借款人sid") private String borrowerSid; // 借款人sid @ApiModelProperty("借款人姓名") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerVo.java index f786931a7a..acf8ae3b87 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatecustomer/LoanHomevisitInvestigateCustomerVo.java @@ -52,7 +52,7 @@ public class LoanHomevisitInvestigateCustomerVo implements Vo { private String sid; // sid @ApiModelProperty("是否为实际购车人") - private String isConfirmRealBuyer; // 是否为实际购车人 + private Boolean isConfirmRealBuyer; // 是否为实际购车人 @ApiModelProperty("借款人sid") private String borrowerSid; // 借款人sid @ApiModelProperty("借款人姓名") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java new file mode 100644 index 0000000000..294fdf366f --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitOtherPeoVo implements Vo { + + private String sid; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("人员类型value") + private String personnelType; + @ApiModelProperty("人员类型key") + private String personnelKey; + @ApiModelProperty("电话") + private String mobile; + @ApiModelProperty("身份证") + private String idCard; + @ApiModelProperty("现住址") + private String address; + @ApiModelProperty("公司") + private String company; + @ApiModelProperty("职业") + private String job; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java index f0feed1626..18aceb3579 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomeVisitInvestigateInitCustomerVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomeVisitInvestigateInitReportStateVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -70,4 +71,6 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index 3be102fe91..04bbdd71d1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -112,4 +112,14 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean getHomeVisitDataInfo(String sid) { return loanHomevisitInvestigateService.getHomeVisitDataInfo(sid); } + + @Override + public ResultBean getHomeVisitCustomerInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitCustomerInfo(sid); + } + + @Override + public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitCustomerInfo(dto); + } } 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 794ca43137..7608d54600 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 @@ -32,10 +32,13 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo; @@ -43,6 +46,7 @@ import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevis import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderService; +import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportService; import org.apache.commons.lang3.StringUtils; @@ -55,6 +59,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -87,6 +92,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanHomevisitInvestigateQuery query = pq.getParams(); @@ -343,4 +350,51 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitCustomerInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitCustomerVo loanHomeVisitInvestigateInitCustomerVo = baseMapper.getHomeVisitCustomerInfo(sid); + //银行卡附件 + List loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + List bankCardImages = new ArrayList<>(); + if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) { + for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) { + bankCardImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl()); + } + } + loanHomeVisitInvestigateInitCustomerVo.setBankCardImages(bankCardImages); + //其他人员 + List loanHomeVisitInvestigateInitOtherPeoVos = loanHomevisitInvestigateOtherpeoService.selByMainSid(sid); + loanHomeVisitInvestigateInitCustomerVo.setOtherPersonnel(loanHomeVisitInvestigateInitOtherPeoVos); + return rb.success().setData(loanHomeVisitInvestigateInitCustomerVo); + } + + public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomevisitInvestigateCustomerDto loanHomevisitInvestigateCustomerDto = new LoanHomevisitInvestigateCustomerDto(); + BeanUtil.copyProperties(dto,loanHomevisitInvestigateCustomerDto); + loanHomevisitInvestigateCustomerDto.setIsConfirmRealBuyer(dto.getActualBuyer()); + loanHomevisitInvestigateCustomerDto.setBorrowerSid(dto.getLenderSid()); + loanHomevisitInvestigateCustomerDto.setBorrowerName(dto.getLenderNam()); + loanHomevisitInvestigateCustomerDto.setBorrowerIdNumber(dto.getIdNumber()); + loanHomevisitInvestigateCustomerDto.setBorrowerMobile(dto.getMobile()); + loanHomevisitInvestigateCustomerDto.setBorrowerCareerKey(dto.getLenderJobKey()); + loanHomevisitInvestigateCustomerDto.setBorrowerCareerValue(dto.getLenderJob()); + loanHomevisitInvestigateCustomerDto.setMaritalStatusKey(dto.getMarriageTypeKey()); + loanHomevisitInvestigateCustomerDto.setMaritalStatusValue(dto.getMarriageType()); + loanHomevisitInvestigateCustomerDto.setIsChildrenKey(dto.getChildrenKey()); + loanHomevisitInvestigateCustomerDto.setIsChildrenValue(dto.getChildren()); + loanHomevisitInvestigateCustomerDto.setBorrowerDomAddress(dto.getKoseki()); + loanHomevisitInvestigateCustomerDto.setBorrowerPreAddress(dto.getAddress()); + loanHomevisitInvestigateCustomerDto.setBankCardNo(dto.getBankNumber()); + loanHomevisitInvestigateCustomerDto.setDepositBank(dto.getInvoBank()); + loanHomevisitInvestigateCustomerDto.setSpouseIdNumber(dto.getSpouseIdCard()); + loanHomevisitInvestigateCustomerDto.setSpouseCareerValue(dto.getSpouseJob()); + loanHomevisitInvestigateCustomerDto.setEmergencyContact(dto.getEmergencyContactName()); + loanHomevisitInvestigateCustomerDto.setEmergencyMobile(dto.getEmergencyContactMobile()); + loanHomevisitInvestigateCustomerDto.setRelationshipKey(dto.getEmergencyContactTypeKey()); + loanHomevisitInvestigateCustomerDto.setRelationshipValue(dto.getEmergencyContactType()); + loanHomevisitInvestigateCustomerService.saveOrUpdateDto(loanHomevisitInvestigateCustomerDto); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.java index ebfae1d87d..ddab657adb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.java @@ -54,16 +54,15 @@ import java.util.List; @Mapper public interface LoanHomevisitInvestigateFileMapper extends BaseMapper { - //@Update("update loan_homevisit_investigate_file set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from loan_homevisit_investigate_file") - List selectListVo(); + //@Update("update loan_homevisit_investigate_file set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - @Select("select * from loan_homevisit_investigate_file where mainSid = #{sid} and attachType = #{attachType}") - List selByMainSidAndTypeKey(@Param("sid") String sid,@Param("attachType") String attachType); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from loan_homevisit_investigate_file") + List selectListVo(); + + List selByMainSidAndTypeKey(@Param("sid") String sid, @Param("attachType") String attachType, @Param("path") String path); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.xml index 599eb80a3e..e93b1ea482 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.xml @@ -1,13 +1,33 @@ - - - - - + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java index 468b6c32ab..d5cf063c2a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileService.java @@ -302,6 +302,6 @@ public class LoanHomevisitInvestigateFileService extends MybatisBaseService selByMainSidAndTypeKey(String sid, String attachType) { - return baseMapper.selByMainSidAndTypeKey(sid,attachType); + return baseMapper.selByMainSidAndTypeKey(sid,attachType,fileUploadComponent.getUrlPrefix()); } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java index eccbc8e36f..6379515af5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.java @@ -29,6 +29,8 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -62,4 +64,6 @@ public interface LoanHomevisitInvestigateOtherpeoMapper extends BaseMapper selectListVo(); + + List selByMainSid(String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml index 74d114b307..7c4adbddc9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml @@ -1,13 +1,35 @@ - - - - - + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java index 33cc73c338..dd0459d04c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoService.java @@ -28,18 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.*; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoQuery; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDto; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoFeign; import org.springframework.stereotype.Service; @@ -107,4 +102,8 @@ public class LoanHomevisitInvestigateOtherpeoService extends MybatisBaseService< BeanUtil.copyProperties(entity, vo); return vo; } + + public List selByMainSid(String sid) { + return baseMapper.selByMainSid(sid); + } } \ No newline at end of file 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 new file mode 100644 index 0000000000..ac35427f7f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java @@ -0,0 +1,63 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo { + + private String sid; + @ApiModelProperty("实际购车人") + private Boolean actualBuyer; + @ApiModelProperty("借款人sid") + private String lenderSid; + @ApiModelProperty("借款人姓名") + private String lenderNam; + @ApiModelProperty("身份证") + private String idNumber; + @ApiModelProperty("电话") + private String mobile; + @ApiModelProperty("职业value") + private String lenderJob; + @ApiModelProperty("职业key") + private String lenderJobKey; + @ApiModelProperty("婚姻状况value") + private String marriageType; + @ApiModelProperty("婚姻状况key") + private String marriageTypeKey; + @ApiModelProperty("是否有子女value") + private String children; + @ApiModelProperty("是否有子女key") + private String childrenKey; + @ApiModelProperty("户籍地址") + private String koseki; + @ApiModelProperty("现居住地址") + private String address; + @ApiModelProperty("开户行") + private String invoBank; + @ApiModelProperty("银行账号") + private String bankNumber; + @ApiModelProperty("银行卡照片") + private List bankCardImages; + @ApiModelProperty("配偶姓名") + private String spouseName; + @ApiModelProperty("配偶身份证") + private String spouseIdCard; + @ApiModelProperty("配偶电话") + private String spouseMobile; + @ApiModelProperty("配偶职业") + private String spouseJob; + @ApiModelProperty("其他人员") + private List otherPersonnel; + @ApiModelProperty("紧急联系人姓名") + private String emergencyContactName; + @ApiModelProperty("紧急联系人电话") + private String emergencyContactMobile; + @ApiModelProperty("紧急联系人类型value") + private String emergencyContactType; + @ApiModelProperty("紧急联系人类型key") + private String emergencyContactTypeKey; +} 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 new file mode 100644 index 0000000000..8070ab3f9c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitOtherPeoVo implements Vo { + + private String sid; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("人员类型value") + private String personnelType; + @ApiModelProperty("人员类型key") + private String personnelKey; + @ApiModelProperty("电话") + private String mobile; + @ApiModelProperty("身份证") + private String idCard; + @ApiModelProperty("现住址") + private String address; + @ApiModelProperty("公司") + private String company; + @ApiModelProperty("职业") + private String job; +} 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 new file mode 100644 index 0000000000..9f86e31a72 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto { + + private String sid; + @ApiModelProperty("实际购车人") + private Boolean actualBuyer; + @ApiModelProperty("借款人sid") + private String lenderSid; + @ApiModelProperty("借款人姓名") + private String lenderNam; + @ApiModelProperty("身份证") + private String idNumber; + @ApiModelProperty("电话") + private String mobile; + @ApiModelProperty("职业value") + private String lenderJob; + @ApiModelProperty("职业key") + private String lenderJobKey; + @ApiModelProperty("婚姻状况value") + private String marriageType; + @ApiModelProperty("婚姻状况key") + private String marriageTypeKey; + @ApiModelProperty("是否有子女value") + private String children; + @ApiModelProperty("是否有子女key") + private String childrenKey; + @ApiModelProperty("户籍地址") + private String koseki; + @ApiModelProperty("现居住地址") + private String address; + @ApiModelProperty("开户行") + private String invoBank; + @ApiModelProperty("银行账号") + private String bankNumber; + @ApiModelProperty("银行卡照片") + private List bankCardImages = new ArrayList<>(); + @ApiModelProperty("配偶姓名") + private String spouseName; + @ApiModelProperty("配偶身份证") + private String spouseIdCard; + @ApiModelProperty("配偶电话") + private String spouseMobile; + @ApiModelProperty("配偶职业") + private String spouseJob; + @ApiModelProperty("其他人员") + private List otherPersonnel = new ArrayList<>(); + @ApiModelProperty("紧急联系人姓名") + private String emergencyContactName; + @ApiModelProperty("紧急联系人电话") + private String emergencyContactMobile; + @ApiModelProperty("紧急联系人类型value") + private String emergencyContactType; + @ApiModelProperty("紧急联系人类型key") + private String emergencyContactTypeKey; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java index 844a4c3176..4161567779 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java @@ -43,4 +43,14 @@ public interface LoanHomeVisitInvestigateFeign { @GetMapping("/getHomeVisitDataInfo") @ResponseBody public ResultBean getHomeVisitDataInfo(@RequestParam("sid") String sid); + + @ApiOperation("初始化家访考察客户信息") + @GetMapping("/getHomeVisitCustomerInfo") + @ResponseBody + public ResultBean getHomeVisitCustomerInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察客户信息") + @PostMapping("/saveHomeVisitCustomerInfo") + @ResponseBody + public ResultBean saveHomeVisitCustomerInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveCustomerDto dto); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index 8a072e2888..5bfab19b74 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -57,4 +57,14 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei public ResultBean getHomeVisitDataInfo(String sid) { return loanHomeVisitInvestigateService.getHomeVisitDataInfo(sid); } + + @Override + public ResultBean getHomeVisitCustomerInfo(String sid) { + return loanHomeVisitInvestigateService.getHomeVisitCustomerInfo(sid); + } + + @Override + public ResultBean saveHomeVisitCustomerInfo(AppLoanHomeVisitInvestigateSaveCustomerDto dto) { + return loanHomeVisitInvestigateService.saveHomeVisitCustomerInfo(dto); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 3b6aae782e..98c0ba43f9 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -110,4 +110,20 @@ public class LoanHomeVisitInvestigateService { BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitInformationStateVo); return rb.success().setData(appLoanHomeVisitInvestigateInitInformationStateVo); } + + public ResultBean getHomeVisitCustomerInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitCustomerVo data = loanHomevisitInvestigateFeign.getHomeVisitCustomerInfo(sid).getData(); + AppLoanHomeVisitInvestigateInitCustomerVo appLoanHomeVisitInvestigateInitCustomerVo = new AppLoanHomeVisitInvestigateInitCustomerVo(); + BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitCustomerVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitCustomerVo); + } + + public ResultBean saveHomeVisitCustomerInfo(AppLoanHomeVisitInvestigateSaveCustomerDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateSaveCustomerDto loanHomeVisitInvestigateSaveCustomerDto = new LoanHomeVisitInvestigateSaveCustomerDto(); + BeanUtil.copyProperties(dto,loanHomeVisitInvestigateSaveCustomerDto); + loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto); + return rb.success(); + } } \ No newline at end of file From 70fccd7ce1ef1cb633ed7fcaa7ed470beb9afbc9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 15 Aug 2023 10:32:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oanHomeVisitInvestigateInitCustomerVo.java | 4 +++ ...anHomeVisitInvestigateSaveCustomerDto.java | 4 +-- ...anHomeVisitInvestigateInitOtherPeoDto.java | 29 +++++++++++++++++++ ...oanHomeVisitInvestigateInitOtherPeoVo.java | 2 ++ .../LoanHomevisitInvestigateMapper.xml | 2 ++ ...LoanHomevisitInvestigateOtherpeoMapper.xml | 1 + ...oanHomeVisitInvestigateInitCustomerVo.java | 4 +++ ...anHomeVisitInvestigateInitOtherPeoDto.java | 29 +++++++++++++++++++ ...oanHomeVisitInvestigateInitOtherPeoVo.java | 2 ++ ...anHomeVisitInvestigateSaveCustomerDto.java | 6 +++- 10 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoDto.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java index 429e7f659f..c0c430cbdb 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java @@ -52,6 +52,10 @@ public class LoanHomeVisitInvestigateInitCustomerVo implements Vo { private String spouseMobile; @ApiModelProperty("配偶职业") private String spouseJob; + @ApiModelProperty("配偶户籍地址") + private String spouseDomAddress; + @ApiModelProperty("配偶现住址") + private String spousePreAddress; @ApiModelProperty("其他人员") private List otherPersonnel = new ArrayList<>(); @ApiModelProperty("紧急联系人姓名") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java index 3f1be16747..097d0f947c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateSaveCustomerDto.java @@ -1,6 +1,6 @@ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -53,7 +53,7 @@ public class LoanHomeVisitInvestigateSaveCustomerDto implements Dto { @ApiModelProperty("配偶职业") private String spouseJob; @ApiModelProperty("其他人员") - private List otherPersonnel = new ArrayList<>(); + private List otherPersonnel = new ArrayList<>(); @ApiModelProperty("紧急联系人姓名") private String emergencyContactName; @ApiModelProperty("紧急联系人电话") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoDto.java new file mode 100644 index 0000000000..efb5b41262 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoDto.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitOtherPeoDto implements Vo { + + private String sid; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("人员类型value") + private String personnelType; + @ApiModelProperty("人员类型key") + private String personnelKey; + @ApiModelProperty("电话") + private String mobile; + @ApiModelProperty("身份证") + private String idCard; + @ApiModelProperty("户籍地址") + private String peoDomAddress; + @ApiModelProperty("现住址") + private String address; + @ApiModelProperty("公司") + private String company; + @ApiModelProperty("职业") + private String job; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java index 294fdf366f..ceea476d2c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.java @@ -18,6 +18,8 @@ public class LoanHomeVisitInvestigateInitOtherPeoVo implements Vo { private String mobile; @ApiModelProperty("身份证") private String idCard; + @ApiModelProperty("户籍地址") + private String peoDomAddress; @ApiModelProperty("现住址") private String address; @ApiModelProperty("公司") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml index 75f4b76aac..156220544c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml @@ -61,6 +61,8 @@ spouseIdNumber AS spouseIdCard, spouseMobile, spouseCareerValue AS spouseJob, + spouseDomAddress, + spousePreAddress, emergencyContact AS emergencyContactName, emergencyMobile AS emergencyContactMobile, relationshipKey AS emergencyContactTypeKey, diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml index 7c4adbddc9..bd93c3abeb 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml @@ -26,6 +26,7 @@ peoType AS personnelKey, mobile, idNumber AS idCard, + peoDomAddress, peoPreAddress AS address, workUnit AS company, peoCareerValue AS job 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 ac35427f7f..c3a219829a 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 @@ -50,6 +50,10 @@ public class AppLoanHomeVisitInvestigateInitCustomerVo implements Vo { private String spouseMobile; @ApiModelProperty("配偶职业") private String spouseJob; + @ApiModelProperty("配偶户籍地址") + private String spouseDomAddress; + @ApiModelProperty("配偶现住址") + private String spousePreAddress; @ApiModelProperty("其他人员") private List otherPersonnel; @ApiModelProperty("紧急联系人姓名") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoDto.java new file mode 100644 index 0000000000..b51fe026a9 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoDto.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitOtherPeoDto implements Vo { + + private String sid; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("人员类型value") + private String personnelType; + @ApiModelProperty("人员类型key") + private String personnelKey; + @ApiModelProperty("电话") + private String mobile; + @ApiModelProperty("身份证") + private String idCard; + @ApiModelProperty("户籍地址") + private String peoDomAddress; + @ApiModelProperty("现住址") + private String address; + @ApiModelProperty("公司") + private String company; + @ApiModelProperty("职业") + private String job; +} 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 8070ab3f9c..61ecaa8db7 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 @@ -18,6 +18,8 @@ public class AppLoanHomeVisitInvestigateInitOtherPeoVo implements Vo { private String mobile; @ApiModelProperty("身份证") private String idCard; + @ApiModelProperty("户籍地址") + private String peoDomAddress; @ApiModelProperty("现住址") private String address; @ApiModelProperty("公司") 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 9f86e31a72..8e7119edaa 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 @@ -51,8 +51,12 @@ public class AppLoanHomeVisitInvestigateSaveCustomerDto implements Dto { private String spouseMobile; @ApiModelProperty("配偶职业") private String spouseJob; + @ApiModelProperty("配偶户籍地址") + private String spouseDomAddress; + @ApiModelProperty("配偶现住址") + private String spousePreAddress; @ApiModelProperty("其他人员") - private List otherPersonnel = new ArrayList<>(); + private List otherPersonnel = new ArrayList<>(); @ApiModelProperty("紧急联系人姓名") private String emergencyContactName; @ApiModelProperty("紧急联系人电话") From 9185e7841f146c20af3fecf2492656dbc3bc8699 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 15 Aug 2023 13:51:45 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateFeign.java | 6 +++ .../LoanHomeVisitInvestigateInitOrderVo.java | 27 ++++++++++++ .../LoanHomevisitInvestigateRest.java | 6 +++ .../LoanHomevisitInvestigateService.java | 8 ++++ .../LoanHomevisitInvestigateOrderMapper.java | 3 ++ .../LoanHomevisitInvestigateOrderMapper.xml | 42 +++++++++++++++---- .../LoanHomevisitInvestigateOrderService.java | 11 +++-- ...ppLoanHomeVisitInvestigateInitOrderVo.java | 27 ++++++++++++ ...anHomeVisitInvestigateSaveCustomerDto.java | 2 + .../LoanHomeVisitInvestigateFeign.java | 5 +++ .../LoanHomeVisitInvestigateRest.java | 5 +++ .../LoanHomeVisitInvestigateService.java | 9 ++++ 12 files changed, 136 insertions(+), 15 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index 0e23e93102..0f8de46073 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -105,4 +106,9 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/saveHomeVisitCustomerInfo") @ResponseBody public ResultBean saveHomeVisitCustomerInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveCustomerDto dto); + + @ApiOperation("初始化家访考察订单信息") + @GetMapping("/getHomeVisitOrderInfo") + @ResponseBody + public ResultBean getHomeVisitOrderInfo(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java new file mode 100644 index 0000000000..c7c4bf242d --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitOrderVo implements Vo { + + private String sid; + @ApiModelProperty("销售订单sid") + private String orderSid; + @ApiModelProperty("车辆信息是否确认") + private String carInfoKey; + @ApiModelProperty("车辆信息备注") + private String carInfoRemarks; + @ApiModelProperty("金融方案是否确认") + private String financeKey; + @ApiModelProperty("金融方案备注") + private String financeRemarks; + @ApiModelProperty("金融首付比例") + private String finDownPay; + @ApiModelProperty("金融首付比例备注") + private String finDownPayRemarks; + @ApiModelProperty("家访考察表sid") + private String mainSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index 04bbdd71d1..1455ea7162 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -122,4 +123,9 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) { return loanHomevisitInvestigateService.saveHomeVisitCustomerInfo(dto); } + + @Override + public ResultBean getHomeVisitOrderInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitOrderInfo(sid); + } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index 7608d54600..ab3c7718dc 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 @@ -36,6 +36,7 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevis import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; @@ -397,4 +398,11 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitOrderInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitOrderVo loanHomeVisitInvestigateInitOrderVos = loanHomevisitInvestigateOrderService.getHomeVisitOrderInfo(sid); + loanHomeVisitInvestigateInitOrderVos.setMainSid(sid); + return rb.success().setData(loanHomeVisitInvestigateInitOrderVos); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.java index d3feb7b8c0..3775740191 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,4 +67,6 @@ public interface LoanHomevisitInvestigateOrderMapper extends BaseMapper - - - - - + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderService.java index ebdaa71752..c5b329a1c6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderService.java @@ -28,18 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateorder; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.*; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrder; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderQuery; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderFeign; import org.springframework.stereotype.Service; @@ -111,4 +106,8 @@ public class LoanHomevisitInvestigateOrderService extends MybatisBaseService getHomeVisitOrderInfo(@RequestParam("sid") String sid); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index 5bfab19b74..7970bedd41 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -67,4 +67,9 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei public ResultBean saveHomeVisitCustomerInfo(AppLoanHomeVisitInvestigateSaveCustomerDto dto) { return loanHomeVisitInvestigateService.saveHomeVisitCustomerInfo(dto); } + + @Override + public ResultBean getHomeVisitOrderInfo(String sid) { + return loanHomeVisitInvestigateService.getHomeVisitOrderInfo(sid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 98c0ba43f9..6b7a65307d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -126,4 +127,12 @@ public class LoanHomeVisitInvestigateService { loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto); return rb.success(); } + + public ResultBean getHomeVisitOrderInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitOrderVo data = loanHomevisitInvestigateFeign.getHomeVisitOrderInfo(sid).getData(); + AppLoanHomeVisitInvestigateInitOrderVo appLoanHomeVisitInvestigateInitOrderVo = new AppLoanHomeVisitInvestigateInitOrderVo(); + BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitOrderVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitOrderVo); + } } \ No newline at end of file From f62f4388013c7b3d898b2b9b4592b1f0386b9d2f Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 15 Aug 2023 14:23:41 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateFeign.java | 18 +++++++++ .../LoanHomeVisitInvestigateInitOperDto.java | 23 +++++++++++ .../LoanHomeVisitInvestigateInitOperVo.java | 23 +++++++++++ .../LoanHomeVisitInvestigateInitOrderDto.java | 27 +++++++++++++ .../LoanHomevisitInvestigateRest.java | 18 +++++++++ .../LoanHomevisitInvestigateService.java | 37 ++++++++++++++++++ ...nHomevisitInvestigateOperationsMapper.java | 3 ++ ...anHomevisitInvestigateOperationsMapper.xml | 38 ++++++++++++++----- ...HomevisitInvestigateOperationsService.java | 11 +++--- ...ppLoanHomeVisitInvestigateInitOperDto.java | 23 +++++++++++ ...AppLoanHomeVisitInvestigateInitOperVo.java | 23 +++++++++++ ...pLoanHomeVisitInvestigateInitOrderDto.java | 27 +++++++++++++ ...ppLoanHomeVisitInvestigateInitOrderVo.java | 2 + .../LoanHomeVisitInvestigateFeign.java | 16 ++++++++ .../LoanHomeVisitInvestigateRest.java | 15 ++++++++ .../LoanHomeVisitInvestigateService.java | 27 +++++++++++++ 16 files changed, 316 insertions(+), 15 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderDto.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index 0f8de46073..d8e8803dd9 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -25,6 +25,9 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -111,4 +114,19 @@ public interface LoanHomevisitInvestigateFeign { @GetMapping("/getHomeVisitOrderInfo") @ResponseBody public ResultBean getHomeVisitOrderInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察订单信息") + @PostMapping("/saveHomeVisitOrderInfo") + @ResponseBody + public ResultBean saveHomeVisitOrderInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitOrderDto dto); + + @ApiOperation("初始化家访考察运营经历") + @GetMapping("/getHomeVisitOperationInfo") + @ResponseBody + public ResultBean getHomeVisitOperationInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察运营经历") + @PostMapping("/saveHomeVisitOperationInfo") + @ResponseBody + public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitOperDto dto); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperDto.java new file mode 100644 index 0000000000..5ed3cf449a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperDto.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitOperDto implements Vo { + + private String sid; + @ApiModelProperty("运营年限") + private String numYears; + @ApiModelProperty("驾驶类型value") + private String driveType; + @ApiModelProperty("驾驶类型key") + private String driveKey; + @ApiModelProperty("运营方式value") + 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/LoanHomeVisitInvestigateInitOperVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java new file mode 100644 index 0000000000..c89751f3b5 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateoperations/LoanHomeVisitInvestigateInitOperVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitOperVo implements Vo { + + private String sid; + @ApiModelProperty("运营年限") + private String numYears; + @ApiModelProperty("驾驶类型value") + private String driveType; + @ApiModelProperty("驾驶类型key") + private String driveKey; + @ApiModelProperty("运营方式value") + 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/LoanHomeVisitInvestigateInitOrderDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderDto.java new file mode 100644 index 0000000000..26bddc95b4 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomeVisitInvestigateInitOrderDto.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitOrderDto implements Vo { + + private String sid; + @ApiModelProperty("销售订单sid") + private String orderSid; + @ApiModelProperty("车辆信息是否确认") + private String carInfoKey; + @ApiModelProperty("车辆信息备注") + private String carInfoRemarks; + @ApiModelProperty("金融方案是否确认") + private String financeKey; + @ApiModelProperty("金融方案备注") + private String financeRemarks; + @ApiModelProperty("金融首付比例") + private String finDownPay; + @ApiModelProperty("金融首付比例备注") + private String finDownPayRemarks; + @ApiModelProperty("家访考察表sid") + private String mainSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index 1455ea7162..2e2ff3eb9f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -26,6 +26,9 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -128,4 +131,19 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean getHomeVisitOrderInfo(String sid) { return loanHomevisitInvestigateService.getHomeVisitOrderInfo(sid); } + + @Override + public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateInitOrderDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitOrderInfo(dto); + } + + @Override + public ResultBean getHomeVisitOperationInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitOperationInfo(sid); + } + + @Override + public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitOperationInfo(dto); + } } 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 ab3c7718dc..a4f4d6d199 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 @@ -35,9 +35,14 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevis import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo; @@ -405,4 +410,36 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitOperationInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitOperVo loanHomeVisitInvestigateInitOperVo = loanHomevisitInvestigateOperationsService.getHomeVisitOperationInfo(sid); + loanHomeVisitInvestigateInitOperVo.setMainSid(sid); + return rb.success().setData(loanHomeVisitInvestigateInitOperVo); + } + + public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomevisitInvestigateOperationsDto loanHomevisitInvestigateOperationsDto = new LoanHomevisitInvestigateOperationsDto(); + BeanUtil.copyProperties(dto,loanHomevisitInvestigateOperationsDto); + loanHomevisitInvestigateOperationsDto.setIndustryYears(dto.getNumYears()); + loanHomevisitInvestigateOperationsDto.setDriveProTypeKey(dto.getDriveKey()); + loanHomevisitInvestigateOperationsDto.setDriveProTypeValue(dto.getDriveType()); + loanHomevisitInvestigateOperationsDto.setBeforeOpeTypeKey(dto.getOperationKey()); + loanHomevisitInvestigateOperationsDto.setBeforeOpeTypeValue(dto.getOperationType()); + loanHomevisitInvestigateOperationsService.saveOrUpdateDto(loanHomevisitInvestigateOperationsDto); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.java index bb08ae0279..ec50890cde 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,4 +67,6 @@ public interface LoanHomevisitInvestigateOperationsMapper extends BaseMapper - - - - - + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsService.java index 1de7f13d0e..368de93c8c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsService.java @@ -28,18 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateoperations; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.*; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperations; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsQuery; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDto; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsFeign; import org.springframework.stereotype.Service; @@ -111,4 +106,8 @@ public class LoanHomevisitInvestigateOperationsService extends MybatisBaseServic public LoanHomevisitInvestigateOperationsDetailsVo selByMainSid(String sid) { return baseMapper.selByMainSid(sid); } + + public LoanHomeVisitInvestigateInitOperVo getHomeVisitOperationInfo(String sid) { + return baseMapper.getHomeVisitOperationInfo(sid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperDto.java new file mode 100644 index 0000000000..2e582a5a47 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperDto.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitOperDto implements Vo { + + private String sid; + @ApiModelProperty("运营年限") + private String numYears; + @ApiModelProperty("驾驶类型value") + private String driveType; + @ApiModelProperty("驾驶类型key") + private String driveKey; + @ApiModelProperty("运营方式value") + 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/AppLoanHomeVisitInvestigateInitOperVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java new file mode 100644 index 0000000000..613052d35c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOperVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitOperVo implements Vo { + + private String sid; + @ApiModelProperty("运营年限") + private String numYears; + @ApiModelProperty("驾驶类型value") + private String driveType; + @ApiModelProperty("驾驶类型key") + private String driveKey; + @ApiModelProperty("运营方式value") + 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/AppLoanHomeVisitInvestigateInitOrderDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderDto.java new file mode 100644 index 0000000000..84eff0fb22 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderDto.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitOrderDto implements Vo { + + private String sid; + @ApiModelProperty("销售订单sid") + private String orderSid; + @ApiModelProperty("车辆信息是否确认") + private String carInfoKey; + @ApiModelProperty("车辆信息备注") + private String carInfoRemarks; + @ApiModelProperty("金融方案是否确认") + private String financeKey; + @ApiModelProperty("金融方案备注") + private String financeRemarks; + @ApiModelProperty("金融首付比例") + private String finDownPay; + @ApiModelProperty("金融首付比例备注") + private String finDownPayRemarks; + @ApiModelProperty("家访考察表sid") + private String mainSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderVo.java index 720b03f63e..598ed33813 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderVo.java @@ -24,4 +24,6 @@ public class AppLoanHomeVisitInvestigateInitOrderVo implements Vo { private String finDownPay; @ApiModelProperty("金融首付比例备注") private String finDownPayRemarks; + @ApiModelProperty("家访考察表sid") + private String mainSid; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java index 783ea5cd25..2e920ab030 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java @@ -58,4 +58,20 @@ public interface LoanHomeVisitInvestigateFeign { @GetMapping("/getHomeVisitOrderInfo") @ResponseBody public ResultBean getHomeVisitOrderInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察订单信息") + @PostMapping("/saveHomeVisitOrderInfo") + @ResponseBody + public ResultBean saveHomeVisitOrderInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitOrderDto dto); + + @ApiOperation("初始化家访考察运营经历") + @GetMapping("/getHomeVisitOperationInfo") + @ResponseBody + public ResultBean getHomeVisitOperationInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察运营经历") + @PostMapping("/saveHomeVisitOperationInfo") + @ResponseBody + public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitOperDto dto); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index 7970bedd41..376f341e4d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -72,4 +72,19 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei public ResultBean getHomeVisitOrderInfo(String sid) { return loanHomeVisitInvestigateService.getHomeVisitOrderInfo(sid); } + + @Override + public ResultBean saveHomeVisitOrderInfo(AppLoanHomeVisitInvestigateInitOrderDto dto) { + return loanHomeVisitInvestigateService.saveHomeVisitOrderInfo(dto); + } + + @Override + public ResultBean getHomeVisitOperationInfo(String sid) { + return loanHomeVisitInvestigateService.getHomeVisitOperationInfo(sid); + } + + @Override + public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateInitOperDto dto) { + return loanHomeVisitInvestigateService.saveHomeVisitOperationInfo(dto); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index 6b7a65307d..ec99a342d4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -28,6 +28,9 @@ package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*; import com.yxt.common.base.utils.StringUtils; @@ -135,4 +138,28 @@ public class LoanHomeVisitInvestigateService { BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitOrderVo); return rb.success().setData(appLoanHomeVisitInvestigateInitOrderVo); } + + public ResultBean saveHomeVisitOrderInfo(AppLoanHomeVisitInvestigateInitOrderDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitOrderDto loanHomeVisitInvestigateInitOrderDto = new LoanHomeVisitInvestigateInitOrderDto(); + BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitOrderDto); + loanHomevisitInvestigateFeign.saveHomeVisitOrderInfo(loanHomeVisitInvestigateInitOrderDto); + return rb.success(); + } + + public ResultBean getHomeVisitOperationInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitOperVo data = loanHomevisitInvestigateFeign.getHomeVisitOperationInfo(sid).getData(); + AppLoanHomeVisitInvestigateInitOperVo appLoanHomeVisitInvestigateInitOperVo = new AppLoanHomeVisitInvestigateInitOperVo(); + BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitOperVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitOperVo); + } + + public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateInitOperDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitOperDto loanHomeVisitInvestigateInitOperDto = new LoanHomeVisitInvestigateInitOperDto(); + BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitOperDto); + loanHomevisitInvestigateFeign.saveHomeVisitOperationInfo(loanHomeVisitInvestigateInitOperDto); + return rb.success(); + } } \ No newline at end of file From f6da0512a09912cd10c90e4a727acd816c5e0d65 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 15 Aug 2023 15:10:19 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateFeign.java | 12 +++++ ...LoanHomevisitInvestigateFeignFallback.java | 46 ++++++++++++++++++ .../LoanHomeVisitInvestigateInitTranDto.java | 43 +++++++++++++++++ .../LoanHomeVisitInvestigateInitTranVo.java | 43 +++++++++++++++++ .../LoanHomevisitInvestigateRest.java | 12 +++++ .../LoanHomevisitInvestigateService.java | 27 +++++++++++ ...anHomevisitInvestigateTransportMapper.java | 3 ++ ...oanHomevisitInvestigateTransportMapper.xml | 48 +++++++++++++++---- ...nHomevisitInvestigateTransportService.java | 11 ++--- ...ppLoanHomeVisitInvestigateInitTranDto.java | 43 +++++++++++++++++ ...AppLoanHomeVisitInvestigateInitTranVo.java | 43 +++++++++++++++++ .../LoanHomeVisitInvestigateFeign.java | 10 ++++ .../LoanHomeVisitInvestigateRest.java | 10 ++++ .../LoanHomeVisitInvestigateService.java | 18 +++++++ 14 files changed, 354 insertions(+), 15 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index d8e8803dd9..00eb05d231 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -29,6 +29,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeV import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -129,4 +131,14 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/saveHomeVisitOperationInfo") @ResponseBody public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitOperDto dto); + + @ApiOperation("初始化家访考察运输信息") + @GetMapping("/getHomeVisitTransportInfo") + @ResponseBody + public ResultBean getHomeVisitTransportInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察运输信息") + @PostMapping("/saveHomeVisitTransportInfo") + @ResponseBody + public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitTranDto dto); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index 275a0980aa..0472244094 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -25,6 +25,12 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -89,4 +95,44 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean getHomeVisitDataInfo(String sid) { return null; } + + @Override + public ResultBean getHomeVisitCustomerInfo(String sid) { + return null; + } + + @Override + public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) { + return null; + } + + @Override + public ResultBean getHomeVisitOrderInfo(String sid) { + return null; + } + + @Override + public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateInitOrderDto dto) { + return null; + } + + @Override + public ResultBean getHomeVisitOperationInfo(String sid) { + return null; + } + + @Override + public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) { + return null; + } + + @Override + public ResultBean getHomeVisitTransportInfo(String sid) { + return null; + } + + @Override + public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranDto.java new file mode 100644 index 0000000000..bc89ced324 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranDto.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitTranDto implements Vo { + + private String sid; + @ApiModelProperty("运输路线") + private String transportRoute; + @ApiModelProperty("运输方式value") + private String transportType; + @ApiModelProperty("运输方式key") + private String transportKey; + @ApiModelProperty("运输货物（去程）") + private String transportGoodsGoTo; + @ApiModelProperty("运输货物（回程）") + private String transportGoodsReturn; + @ApiModelProperty("来回里程") + private String mileage; + @ApiModelProperty("载重（吨）") + private String deadWeight; + @ApiModelProperty("每月/趟") + private String monthCount; + @ApiModelProperty("每趟/元") + private String countPrice; + @ApiModelProperty("每趟油耗") + private String fuelConsumption; + @ApiModelProperty("司机工资") + private String driverWage; + @ApiModelProperty("过路费") + private String roadToll; + @ApiModelProperty("维修保养") + private String maintenance; + @ApiModelProperty("预期收益") + 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/LoanHomeVisitInvestigateInitTranVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java new file mode 100644 index 0000000000..93fe236e97 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatetransport/LoanHomeVisitInvestigateInitTranVo.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitTranVo implements Vo { + + private String sid; + @ApiModelProperty("运输路线") + private String transportRoute; + @ApiModelProperty("运输方式value") + private String transportType; + @ApiModelProperty("运输方式key") + private String transportKey; + @ApiModelProperty("运输货物（去程）") + private String transportGoodsGoTo; + @ApiModelProperty("运输货物（回程）") + private String transportGoodsReturn; + @ApiModelProperty("来回里程") + private String mileage; + @ApiModelProperty("载重（吨）") + private String deadWeight; + @ApiModelProperty("每月/趟") + private String monthCount; + @ApiModelProperty("每趟/元") + private String countPrice; + @ApiModelProperty("每趟油耗") + private String fuelConsumption; + @ApiModelProperty("司机工资") + private String driverWage; + @ApiModelProperty("过路费") + private String roadToll; + @ApiModelProperty("维修保养") + private String maintenance; + @ApiModelProperty("预期收益") + 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/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index 2e2ff3eb9f..c9cdf53d37 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -30,6 +30,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeV import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -146,4 +148,14 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) { return loanHomevisitInvestigateService.saveHomeVisitOperationInfo(dto); } + + @Override + public ResultBean getHomeVisitTransportInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitTransportInfo(sid); + } + + @Override + public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitTransportInfo(dto); + } } 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 a4f4d6d199..ecca749940 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 @@ -46,7 +46,10 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitI import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDto; import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepVo; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerService; import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileService; @@ -442,4 +445,28 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitTransportInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitTranVo loanHomeVisitInvestigateInitTranVo = loanHomevisitInvestigateTransportService.getHomeVisitTransportInfo(sid); + loanHomeVisitInvestigateInitTranVo.setMainSid(sid); + return rb.success().setData(loanHomeVisitInvestigateInitTranVo); + } + + public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomevisitInvestigateTransportDto loanHomevisitInvestigateTransportDto = new LoanHomevisitInvestigateTransportDto(); + BeanUtil.copyProperties(dto,loanHomevisitInvestigateTransportDto); + loanHomevisitInvestigateTransportDto.setTransportTypeKey(dto.getTransportKey()); + loanHomevisitInvestigateTransportDto.setTransportTypeValue(dto.getTransportType()); + loanHomevisitInvestigateTransportDto.setTransportGoodsTrip(dto.getTransportGoodsGoTo()); + loanHomevisitInvestigateTransportDto.setTransportGoodsRetTrip(dto.getTransportGoodsReturn()); + loanHomevisitInvestigateTransportDto.setRoundTripMileage(dto.getMileage()); + loanHomevisitInvestigateTransportDto.setLoad(dto.getDeadWeight()); + loanHomevisitInvestigateTransportDto.setMonthlyTrip(dto.getMonthCount()); + loanHomevisitInvestigateTransportDto.setPerTripYuan(dto.getCountPrice()); + loanHomevisitInvestigateTransportDto.setFuelConsumptionPerTrip(dto.getFuelConsumption()); + loanHomevisitInvestigateTransportService.saveOrUpdateDto(loanHomevisitInvestigateTransportDto); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.java index 8c60b2bd13..1cd992beb9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,4 +67,6 @@ public interface LoanHomevisitInvestigateTransportMapper extends BaseMapper - - - - - + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportService.java index 03917b60d8..f2d754a8ee 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportService.java @@ -28,18 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatetransport; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.*; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransport; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportQuery; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDto; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportFeign; import org.springframework.stereotype.Service; @@ -111,4 +106,8 @@ public class LoanHomevisitInvestigateTransportService extends MybatisBaseService public LoanHomevisitInvestigateTransportDetailsVo selByMainSid(String sid) { return baseMapper.selByMainSid(sid); } + + public LoanHomeVisitInvestigateInitTranVo getHomeVisitTransportInfo(String sid) { + return baseMapper.getHomeVisitTransportInfo(sid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranDto.java new file mode 100644 index 0000000000..12f937b555 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranDto.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitTranDto implements Vo { + + private String sid; + @ApiModelProperty("运输路线") + private String transportRoute; + @ApiModelProperty("运输方式value") + private String transportType; + @ApiModelProperty("运输方式key") + private String transportKey; + @ApiModelProperty("运输货物（去程）") + private String transportGoodsGoTo; + @ApiModelProperty("运输货物（回程）") + private String transportGoodsReturn; + @ApiModelProperty("来回里程") + private String mileage; + @ApiModelProperty("载重（吨）") + private String deadWeight; + @ApiModelProperty("每月/趟") + private String monthCount; + @ApiModelProperty("每趟/元") + private String countPrice; + @ApiModelProperty("每趟油耗") + private String fuelConsumption; + @ApiModelProperty("司机工资") + private String driverWage; + @ApiModelProperty("过路费") + private String roadToll; + @ApiModelProperty("维修保养") + private String maintenance; + @ApiModelProperty("预期收益") + 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/AppLoanHomeVisitInvestigateInitTranVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java new file mode 100644 index 0000000000..fb19fda477 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitTranVo.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitTranVo implements Vo { + + private String sid; + @ApiModelProperty("运输路线") + private String transportRoute; + @ApiModelProperty("运输方式value") + private String transportType; + @ApiModelProperty("运输方式key") + private String transportKey; + @ApiModelProperty("运输货物（去程）") + private String transportGoodsGoTo; + @ApiModelProperty("运输货物（回程）") + private String transportGoodsReturn; + @ApiModelProperty("来回里程") + private String mileage; + @ApiModelProperty("载重（吨）") + private String deadWeight; + @ApiModelProperty("每月/趟") + private String monthCount; + @ApiModelProperty("每趟/元") + private String countPrice; + @ApiModelProperty("每趟油耗") + private String fuelConsumption; + @ApiModelProperty("司机工资") + private String driverWage; + @ApiModelProperty("过路费") + private String roadToll; + @ApiModelProperty("维修保养") + private String maintenance; + @ApiModelProperty("预期收益") + 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/LoanHomeVisitInvestigateFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java index 2e920ab030..179a10c835 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java @@ -74,4 +74,14 @@ public interface LoanHomeVisitInvestigateFeign { @ResponseBody public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitOperDto dto); + @ApiOperation("初始化家访考察运输信息") + @GetMapping("/getHomeVisitTransportInfo") + @ResponseBody + public ResultBean getHomeVisitTransportInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察运输信息") + @PostMapping("/saveHomeVisitTransportInfo") + @ResponseBody + public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitTranDto dto); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index 376f341e4d..c1b2c19ac3 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -87,4 +87,14 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateInitOperDto dto) { return loanHomeVisitInvestigateService.saveHomeVisitOperationInfo(dto); } + + @Override + public ResultBean getHomeVisitTransportInfo(String sid) { + return loanHomeVisitInvestigateService.getHomeVisitTransportInfo(sid); + } + + @Override + public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateInitTranDto dto) { + return loanHomeVisitInvestigateService.saveHomeVisitTransportInfo(dto); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index ec99a342d4..c34f566cd7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -32,6 +32,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeV import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; @@ -162,4 +164,20 @@ public class LoanHomeVisitInvestigateService { loanHomevisitInvestigateFeign.saveHomeVisitOperationInfo(loanHomeVisitInvestigateInitOperDto); return rb.success(); } + + public ResultBean getHomeVisitTransportInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitTranVo data = loanHomevisitInvestigateFeign.getHomeVisitTransportInfo(sid).getData(); + AppLoanHomeVisitInvestigateInitTranVo appLoanHomeVisitInvestigateInitTranVo = new AppLoanHomeVisitInvestigateInitTranVo(); + BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitTranVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitTranVo); + } + + public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateInitTranDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitTranDto loanHomeVisitInvestigateInitTranDto = new LoanHomeVisitInvestigateInitTranDto(); + BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitTranDto); + loanHomevisitInvestigateFeign.saveHomeVisitTransportInfo(loanHomeVisitInvestigateInitTranDto); + return rb.success(); + } } \ No newline at end of file From f4891792de986991a1f724e2b47aa1d6b914ca47 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 15 Aug 2023 16:49:27 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/bussalesorder/BusSalesOrdersVo.java | 10 + .../bussalesorder/BusSalesOrderService.java | 12 +- .../api/loansolutions/LoanSolutionsFeign.java | 11 + .../LoanSolutionsFeignFallback.java | 12 + .../api/loansolutions/app/SolutionListVo.java | 26 + .../loansolutions/app/SolutionssQuery.java | 113 ++++ .../api/loansolutions/app/SolutionssVo.java | 169 +++++ .../biz/loansolutions/LoanSolutionsRest.java | 12 + .../loansolutions/LoanSolutionsService.java | 627 +++++++++++++++++- .../api/risk/solutions/AppSolutionQuery.java | 114 ++++ .../api/risk/solutions/AppSolutionVo.java | 205 ++++++ .../api/risk/solutions/SolutionsFeign.java | 12 + .../biz/risk/solutions/SolutionsRest.java | 10 + .../biz/risk/solutions/SolutionsService.java | 28 + 14 files changed, 1357 insertions(+), 4 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionListVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java index d2994b424b..46d25560e7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java @@ -4,6 +4,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup; import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -22,4 +23,13 @@ public class BusSalesOrdersVo implements Vo { private BusSalesOrderPrice busSalesOrderPrice; private BusSalesOrderMakeup busSalesOrderMakeup; + + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装成交价") + private String szPrice; + + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 53ecd7baf1..dcd2764705 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -4069,7 +4069,7 @@ public class BusSalesOrderService extends MybatisBaseService calculate(@RequestBody CalculateQuery query); + @ApiOperation("销售订单金融方案初始化2") + @PostMapping("/selectDetails2") + ResultBean selectDetails2(@RequestParam("salesOrderSid") String busSid); + + @ApiOperation("移动端计算初始化") + @PostMapping("/details2") + ResultBean details2(@RequestBody SolutionssQuery query); + + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java index a23c1f1dd2..d79f643583 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java @@ -2,6 +2,8 @@ package com.yxt.anrui.riskcenter.api.loansolutions; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.common.core.result.ResultBean; @@ -74,6 +76,16 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign { return null; } + @Override + public ResultBean selectDetails2(String busSid) { + return null; + } + + @Override + public ResultBean details2(SolutionssQuery query) { + return null; + } + /* @Override public ResultBean> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionListVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionListVo.java new file mode 100644 index 0000000000..3c31c7fe83 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionListVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.riskcenter.api.loansolutions.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/15 + **/ +@Data +public class SolutionListVo implements Vo { + private static final long serialVersionUID = -8839895532609865401L; + + @ApiModelProperty(value = "内容") + private String value; + + @ApiModelProperty(value = "单元格大小") + private Integer spanSize; + + @ApiModelProperty("类型:0 最普通的 1 标题的 2是 加上划线的") + private Integer type; + @ApiModelProperty("是否加粗，true是，false否") + private boolean bold; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java new file mode 100644 index 0000000000..53c4df5310 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssQuery.java @@ -0,0 +1,113 @@ +package com.yxt.anrui.riskcenter.api.loansolutions.app; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/15 + **/ +@Data +public class SolutionssQuery implements Query { + private static final long serialVersionUID = 1460628272985480484L; + @JsonProperty("isShowMore") + private boolean isShowMore; + @ApiModelProperty("是否打包：1是0否") + private String isPack; + @ApiModelProperty("政策名称") + private String policyName; + @ApiModelProperty("产品政策sid") + private String policySid; + @ApiModelProperty("主车发票价") + private String mainVehicleAmount; + @ApiModelProperty("配件") + private String accessoriesAmount; + @ApiModelProperty("是否有配件") + private boolean accessoriesAmountCb; + @ApiModelProperty("挂车金额") + private String trailerAmount; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("保险金额") + private String premium; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + @ApiModelProperty("购置税") + private String purchaseTax; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("融资项目总额") + private String loanTotal; + @ApiModelProperty("首付金额") + private String downPayAmount; + @ApiModelProperty("贷款金额") + private String loanAmount; + @ApiModelProperty("贷款期数") + private String loanPeriod; + @ApiModelProperty("贷款保证金比例") + private String bondRatio; + @ApiModelProperty("贷款保证金金额") + private String bondAmount; + @ApiModelProperty("厂家贴息") + private String factoryDiscount; + private String discountCar; + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + + private String downPayRatio; + + private String factoryDiscountUse; + + /*************************其他融和方案汇总*********************************/ + @ApiModelProperty("其它融贷款金额") + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + private boolean otherPolicyIsMain; + private String returnTime; + private String otherPolicySid; + private String otherPolicyName; + + + /*********************************金融方案费用明细*****************************/ + + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + //01公司办理，02自行办理 + @ApiModelProperty("办理方式选择key") + private String dealWayKey; + private String dealWay; + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + @ApiModelProperty("代收购置费") + private String proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private String offsetPremium; + @ApiModelProperty("抵顶购置税") + private String offsetPurchasetax; + @ApiModelProperty("名义留购价") + private String nominalPrice; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java new file mode 100644 index 0000000000..dc18c0d168 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java @@ -0,0 +1,169 @@ +package com.yxt.anrui.riskcenter.api.loansolutions.app; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/15 + **/ +@Data +public class SolutionssVo implements Vo { + private static final long serialVersionUID = 5336776709258881912L; + @ApiModelProperty("是否显示更多") + @JsonProperty("isShowMore") + private boolean isShowMore; + + @ApiModelProperty("关联sid") + private String busSid; + @ApiModelProperty("是否打包：1打包，0不打包") + private String isPack; + @ApiModelProperty("产品政策名称") + private String policyName; + @ApiModelProperty("产品政策sid") + private String policySid; + @ApiModelProperty("融资项目总额") + private String loanTotal; + @ApiModelProperty("主车发票价") + private String mainVehicleAmount; + @ApiModelProperty("配件") + private String accessoriesAmount; + @ApiModelProperty("是否有配件") + private boolean accessoriesAmountCb; + @ApiModelProperty("挂车金额") + private String trailerAmount; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("购置税") + private String purchaseTax; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("保险金额") + private String premium; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + @ApiModelProperty("首付款比例") + private String downPayRatio; + @ApiModelProperty("首付金额") + private String downPayAmount; + @ApiModelProperty("贷款金额") + private String loanAmount; + @ApiModelProperty("贷款期数") + private String loanPeriod; + @ApiModelProperty("保证金比例") + private String bondRatio; + @ApiModelProperty("保证金金额") + private String bondAmount; + @ApiModelProperty("厂家贴息") + private String factoryDiscount; + @ApiModelProperty("厂家贴息用途") + private String factoryDiscountUse; + @ApiModelProperty("年利率") + private String policyYearRatio; + @ApiModelProperty("贷款月还") + private String loanPayMoney; + @ApiModelProperty("贷款利息") + private String loanInterest; + @ApiModelProperty("贴息抵车款") + private String discountCar; + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + /**************************其他融*********************************/ + + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其他融sid") + private String otherPolicySid; + @ApiModelProperty("其它融金额") + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private String otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private String otherPolicyInterest; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + /*************************方案汇总*********************************/ + @ApiModelProperty("'融资首付") + private String loanDownPay; + @ApiModelProperty("总贷款金额") + private String loanAmountTotal; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("月还金额") + private String monthlyRepay; + @ApiModelProperty("利息总额") + private String interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + + /***************************金融方案应收明细*******************************/ + @ApiModelProperty("融资首付") + private String downPayAmounts; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("办理方式选择key") + private String dealWayKey; + @ApiModelProperty("代收合计") + private String proxyTotal; + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + @ApiModelProperty("代收购置费") + private String proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private String offsetPremium; + @ApiModelProperty("抵顶购置税") + private String offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private String offsetTotal; + @ApiModelProperty("应收合计") + private String receivableTotal; + @ApiModelProperty("实收合计") + private String realTotal; + @ApiModelProperty("车辆总价") + private String vehTotalPrice; + @ApiModelProperty("名义留购价") + private String nominalPrice; + + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装成交价") + private String szPrice; + + + @ApiModelProperty("拼接的List") + private List financeForms = new ArrayList<>(); + +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java index cfc12faeb2..4d0850b2fa 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java @@ -4,6 +4,8 @@ import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.common.core.result.ResultBean; @@ -86,6 +88,16 @@ public class LoanSolutionsRest implements LoanSolutionsFeign { return loanSolutionsService.calculate(query); } + @Override + public ResultBean selectDetails2(String busSid) { + return loanSolutionsService.selectDetails2(busSid); + } + + @Override + public ResultBean details2(SolutionssQuery query) { + return loanSolutionsService.details2(query); + } + /* @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index ae05df6b48..c161d0f9bc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -1,20 +1,24 @@ package com.yxt.anrui.riskcenter.biz.loansolutions; import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdersVo; +import com.yxt.anrui.buscenter.api.bussalesorder.OrderSolutionVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; +import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.SolutionDetailsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; +import com.yxt.anrui.riskcenter.biz.loanfinotherPolicy.LoanFinOtherPolicyService; import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService; import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailService; import com.yxt.anrui.riskcenter.biz.loansolutionsotherpolicy.LoanSolutionsOtherpolicyService; @@ -22,12 +26,12 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.math.BigInteger; +import java.util.ArrayList; import java.util.List; /** @@ -57,6 +61,8 @@ public class LoanSolutionsService extends MybatisBaseService selectDetails(String saleOrderSid) { ResultBean rb = ResultBean.fireFail(); @@ -1399,6 +1405,621 @@ public class LoanSolutionsService extends MybatisBaseService selectDetails2(String busSid) { + ResultBean rb = ResultBean.fireFail(); + SolutionssVo solutionssVo = new SolutionssVo(); + //根据关联sid查询是否存在金融方案 + LoanSolutions loanSolutions = baseMapper.selectByApplySid(busSid); + boolean isTrue = false; + if (loanSolutions != null) { + BeanUtil.copyProperties(loanSolutions, solutionssVo); + if (loanSolutions.getTrailerAmount() != null) { + solutionssVo.setGcPrice(loanSolutions.getTrailerAmount().toString()); + } + LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = loanSolutionsOtherpolicyService.selectByLoanSid(loanSolutions.getSid()); + if (loanSolutionsOtherpolicy != null) { + BeanUtil.copyProperties(loanSolutionsOtherpolicy, solutionssVo); + } + LoanSolutionsDetail loanSolutionsDetail = loanSolutionsDetailService.selectLoanSid(loanSolutions.getSid()); + if (loanSolutionsDetail != null) { + BeanUtil.copyProperties(loanSolutionsDetail, solutionssVo); + } + isTrue = true; + } + //查询销售订单的状态 + ResultBean resultBean = busSalesOrderFeign.getSalesOrderOne(busSid); + if (resultBean.getData() != null) { + BusSalesOrdersVo busSalesOrdersVo = resultBean.getData(); + solutionssVo.setSzPrice(busSalesOrdersVo.getSzPrice()); + solutionssVo.setFinalPrice(busSalesOrdersVo.getFinalPrice()); + if (busSalesOrdersVo.getBusSalesOrder() != null) { + BusSalesOrder busSalesOrder = busSalesOrdersVo.getBusSalesOrder(); + //全款且为三方金融 + if ("1".equals(busSalesOrder.getPayTypeKey()) && "2".equals(busSalesOrder.getFinancePlan())) { + solutionssVo.setShowMore(false); + solutionssVo.setFactoryDiscountUse("抵车款"); + } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款 + solutionssVo.setShowMore(true); + solutionssVo.setFactoryDiscountUse("抵利息"); + if (isTrue) { + if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) { + LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid()); + if (loanFinOtherPolicy != null) { + solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName()); + solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid()); + solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod())); + solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString()); + } + } + } + } + } + } + if (isTrue) { + List formList = getFormList(solutionssVo); + solutionssVo.setFinanceForms(formList); + } + solutionssVo.setBusSid(busSid); + return rb.success().setData(solutionssVo); + } + + public List getFormList(SolutionssVo solutionssVo) { + List list = new ArrayList<>(); + boolean isShowMore = solutionssVo.isShowMore(); + if (isShowMore) { + //是否打包 + StringBuilder isPackValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getIsPack())) { + if ("1".equals(solutionssVo.getIsPack())) { + isPackValue = isPackValue.append("是否打包：").append("是"); + } else { + isPackValue = isPackValue.append("是否打包：").append("否"); + } + } else { + isPackValue = isPackValue.append("是否打包：").append("-"); + } + list.add(getValueSpanSize(isPackValue.toString(), 2, 0, false)); + //资方及产品政策 + StringBuilder polivyNameValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getPolicyName())) { + polivyNameValue = polivyNameValue.append("资方及产品政策：").append(solutionssVo.getPolicyName()); + } else { + polivyNameValue = polivyNameValue.append("资方及产品政策：").append("-"); + } + list.add(getValueSpanSize(polivyNameValue.toString(), 2, 0, false)); + //标题 + list.add(getValueSpanSize("融资项目", 2, 1, true)); + //融资项目总额 + StringBuilder loanTotalValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getLoanTotal())) { + loanTotalValue = loanTotalValue.append("融资项目总额：").append(solutionssVo.getLoanTotal()); + + } else { + loanTotalValue = loanTotalValue.append("融资项目总额：").append("-"); + } + list.add(getValueSpanSize(loanTotalValue.toString(), 2, 0, false)); + //主车发票价 + StringBuilder mainVehicleAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getMainVehicleAmount())) { + mainVehicleAmountValue = mainVehicleAmountValue.append("\t").append("主车发票价：").append(solutionssVo.getMainVehicleAmount()); + } else { + mainVehicleAmountValue = mainVehicleAmountValue.append("\t").append("主车发票价：").append("-"); + } + list.add(getValueSpanSize(mainVehicleAmountValue.toString(), 1, 0, false)); + //融资票据 + StringBuilder accessoriesAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getAccessoriesAmount())) { + accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件：").append(solutionssVo.getAccessoriesAmount()); + + } else { + accessoriesAmountValue = accessoriesAmountValue.append("\t").append("配件：").append("-"); + } + list.add(getValueSpanSize(accessoriesAmountValue.toString(), 1, 0, false)); + //挂车 + StringBuilder trailerAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getTrailerAmount())) { + trailerAmountValue = trailerAmountValue.append("\t").append("挂车：").append(solutionssVo.getTrailerAmount()); + + } else { + trailerAmountValue = trailerAmountValue.append("\t").append("挂车：").append("-"); + } + list.add(getValueSpanSize(trailerAmountValue.toString(), 1, 0, false)); + //保险 + StringBuilder premiumValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getPremium())) { + premiumValue = premiumValue.append("\t").append("保险：").append(solutionssVo.getPremium()); + + } else { + premiumValue = premiumValue.append("\t").append("保险：").append("-"); + } + list.add(getValueSpanSize(premiumValue.toString(), 1, 0, false)); + //购置税 + StringBuilder purchaseTaxValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getPurchaseTax())) { + purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税：").append(solutionssVo.getPurchaseTax()); + } else { + purchaseTaxValue = purchaseTaxValue.append("\t").append("购置税：").append("-"); + } + list.add(getValueSpanSize(purchaseTaxValue.toString(), 2, 0, false)); + //首付比例 + StringBuilder downPayRatioValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getDownPayRatio())) { + downPayRatioValue = downPayRatioValue.append("首付比例(%)：").append(solutionssVo.getDownPayRatio()); + + } else { + downPayRatioValue = downPayRatioValue.append("首付比例(%)：").append("-"); + } + list.add(getValueSpanSize(downPayRatioValue.toString(), 1, 0, false)); + //首付金额 + StringBuilder downPayAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getDownPayAmount())) { + downPayAmountValue = downPayAmountValue.append("首付金额：").append(solutionssVo.getDownPayAmount()); + + } else { + downPayAmountValue = downPayAmountValue.append("首付金额：").append("-"); + } + list.add(getValueSpanSize(downPayAmountValue.toString(), 1, 0, false)); + + //产品贷款金额 + StringBuilder loanAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getLoanAmount())) { + loanAmountValue = loanAmountValue.append("产品贷款金额：").append(solutionssVo.getLoanAmount()); + + } else { + loanAmountValue = loanAmountValue.append("产品贷款金额：").append("-"); + } + list.add(getValueSpanSize(loanAmountValue.toString(), 1, 0, false)); + //产品期数 + StringBuilder loanPeriodValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getLoanPeriod())) { + loanPeriodValue = loanPeriodValue.append("产品期数：").append(solutionssVo.getLoanPeriod()); + + } else { + loanPeriodValue = loanPeriodValue.append("产品期数：").append("-"); + } + list.add(getValueSpanSize(loanPeriodValue.toString(), 1, 0, false)); + //贷款保证金比例 + StringBuilder bondRatioValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getBondRatio())) { + bondRatioValue = bondRatioValue.append("贷款保证金比例：").append(solutionssVo.getBondRatio()); + + } else { + bondRatioValue = bondRatioValue.append("贷款保证金比例：").append("-"); + } + list.add(getValueSpanSize(bondRatioValue.toString(), 1, 0, false)); + //贷款保证金 + StringBuilder bondAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getBondAmount())) { + bondAmountValue = bondAmountValue.append("贷款保证金：").append(solutionssVo.getBondAmount()); + } else { + bondAmountValue = bondAmountValue.append("贷款保证金：").append("-"); + } + list.add(getValueSpanSize(bondAmountValue.toString(), 1, 0, false)); + //厂家贴息 + StringBuilder factoryDiscountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getFactoryDiscount())) { + factoryDiscountValue = factoryDiscountValue.append("厂家贴息：").append(solutionssVo.getFactoryDiscount()); + } else { + factoryDiscountValue = factoryDiscountValue.append("厂家贴息：").append("-"); + } + list.add(getValueSpanSize(factoryDiscountValue.toString(), 1, 0, false)); + //厂家贴息用途 + StringBuilder factoryDiscountUseValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getFactoryDiscountUse())) { + factoryDiscountUseValue = factoryDiscountUseValue.append("厂家贴息用途：").append(solutionssVo.getFactoryDiscountUse()); + + } else { + factoryDiscountUseValue = factoryDiscountUseValue.append("厂家贴息用途：").append("-"); + } + list.add(getValueSpanSize(factoryDiscountUseValue.toString(), 1, 0, false)); + //年利率 + StringBuilder policyYearRatioValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getPolicyYearRatio())) { + policyYearRatioValue = policyYearRatioValue.append("年利率：").append(solutionssVo.getPolicyYearRatio()); + + } else { + policyYearRatioValue = policyYearRatioValue.append("年利率：").append("-"); + } + list.add(getValueSpanSize(policyYearRatioValue.toString(), 1, 0, false)); + //利息总额 + StringBuilder loanInterestValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getLoanInterest())) { + loanInterestValue = loanInterestValue.append("利息总额：").append(solutionssVo.getLoanInterest()); + + } else { + loanInterestValue = loanInterestValue.append("利息总额：").append("-"); + } + list.add(getValueSpanSize(loanInterestValue.toString(), 1, 0, false)); + //月还金额 + StringBuilder loanPayMoneyValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getLoanPayMoney())) { + loanPayMoneyValue = loanPayMoneyValue.append("月还金额：").append(solutionssVo.getLoanPayMoney()); + + } else { + loanPayMoneyValue = loanPayMoneyValue.append("月还金额：").append("-"); + } + list.add(getValueSpanSize(loanPayMoneyValue.toString(), 2, 0, false)); + if (solutionssVo.isOtherPolicyState()) { + list.add(getValueSpanSize("其它融", 2, 1, true)); + //其它融名称 + StringBuilder otherPolicyNameValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyName())) { + otherPolicyNameValue = otherPolicyNameValue.append("其它融名称：").append(solutionssVo.getOtherPolicyName()); + + } else { + otherPolicyNameValue = otherPolicyNameValue.append("其它融名称：").append("-"); + } + list.add(getValueSpanSize(otherPolicyNameValue.toString(), 2, 0, false)); + //贷款金额 + StringBuilder otherPolicyAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyAmount())) { + otherPolicyAmountValue = otherPolicyAmountValue.append("贷款金额：").append(solutionssVo.getOtherPolicyAmount()); + + } else { + otherPolicyAmountValue = otherPolicyAmountValue.append("贷款金额：").append("-"); + } + list.add(getValueSpanSize(otherPolicyAmountValue.toString(), 1, 0, false)); + //期数 + StringBuilder otherPolicyPeriodValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyPeriod())) { + otherPolicyPeriodValue = otherPolicyPeriodValue.append("期数：").append(solutionssVo.getOtherPolicyPeriod()); + + } else { + otherPolicyPeriodValue = otherPolicyPeriodValue.append("期数：").append("-"); + } + list.add(getValueSpanSize(otherPolicyPeriodValue.toString(), 1, 0, false)); + + //年利率 + StringBuilder otherPolicyYearRatioValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyYearRatio())) { + otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率：").append(solutionssVo.getOtherPolicyYearRatio()); + } else { + otherPolicyYearRatioValue = otherPolicyYearRatioValue.append("年利率：").append("-"); + } + list.add(getValueSpanSize(otherPolicyYearRatioValue.toString(), 1, 0, false)); + //利息总额 + StringBuilder otherPolicyInterestValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyInterest())) { + otherPolicyInterestValue = otherPolicyInterestValue.append("利息总额：").append(solutionssVo.getOtherPolicyInterest()); + } else { + otherPolicyInterestValue = otherPolicyInterestValue.append("利息总额：").append("-"); + } + list.add(getValueSpanSize(otherPolicyInterestValue.toString(), 1, 0, false)); + //月还金额 + StringBuilder otherPolicyMonthlyRepayValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOtherPolicyMonthlyRepay())) { + otherPolicyMonthlyRepayValue = otherPolicyMonthlyRepayValue.append("月还金额：").append(solutionssVo.getOtherPolicyMonthlyRepay()); + + } else { + otherPolicyMonthlyRepayValue = otherPolicyMonthlyRepayValue.append("月还金额：").append("-"); + } + list.add(getValueSpanSize(otherPolicyMonthlyRepayValue.toString(), 2, 0, false)); + } + //方案汇总 + list.add(getValueSpanSize("方案汇总", 2, 1, true)); + //融资首付 + StringBuilder loanDownPayValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getLoanDownPay())) { + loanDownPayValue = loanDownPayValue.append("融资首付：").append(solutionssVo.getLoanDownPay()); + } else { + loanDownPayValue = loanDownPayValue.append("融资首付：").append("-"); + } + list.add(getValueSpanSize(loanDownPayValue.toString(), 1, 0, false)); + StringBuilder downPayAmountsRatioValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getDownPayAmountsRatio())) { + downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例：").append(solutionssVo.getDownPayAmountsRatio()); + } else { + downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例：").append("-"); + } + list.add(getValueSpanSize(downPayAmountsRatioValue.toString(), 1, 0, false)); + //总贷款金额 + StringBuilder loanAmountTotalValue = new StringBuilder(); + if (org.apache.commons.lang3.StringUtils.isNotBlank(solutionssVo.getLoanAmountTotal())) { + loanAmountTotalValue = loanAmountTotalValue.append("总贷款金额：").append(solutionssVo.getLoanAmountTotal()); + + } else { + loanAmountTotalValue = loanAmountTotalValue.append("总贷款金额：").append("-"); + } + list.add(getValueSpanSize(loanAmountTotalValue.toString(), 1, 0, false)); + //期数 + StringBuilder periodValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getPeriod())) { + periodValue = periodValue.append("期数：").append(solutionssVo.getPeriod()); + + } else { + periodValue = periodValue.append("期数：").append("-"); + } + list.add(getValueSpanSize(periodValue.toString(), 1, 0, false)); + //月还金额 + StringBuilder monthlyRepayValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getMonthlyRepay())) { + monthlyRepayValue = monthlyRepayValue.append("月还金额：").append(solutionssVo.getMonthlyRepay()); + } else { + monthlyRepayValue = monthlyRepayValue.append("月还金额：").append("-"); + } + list.add(getValueSpanSize(monthlyRepayValue.toString(), 1, 0, false)); + //利息总额 + StringBuilder interestValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getInterest())) { + interestValue = interestValue.append("利息总额：").append(solutionssVo.getInterest()); + } else { + interestValue = interestValue.append("利息总额：").append("-"); + } + list.add(getValueSpanSize(interestValue.toString(), 1, 0, false)); + //预计首期还款日 + StringBuilder returnTimeValue = new StringBuilder(); + if (org.apache.commons.lang3.StringUtils.isNotBlank(solutionssVo.getReturnTime())) { + returnTimeValue = returnTimeValue.append("预计首期还款日：").append(solutionssVo.getReturnTime()); + } else { + returnTimeValue = returnTimeValue.append("预计首期还款日：").append("-"); + } + list.add(getValueSpanSize(returnTimeValue.toString(), 1, 0, false)); + //应收明细 + list.add(getValueSpanSize("应收明细", 2, 1, true)); + //融资首付 + StringBuilder downPayAmountsValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getDownPayAmounts())) { + downPayAmountsValue = downPayAmountsValue.append("融资首付：").append(solutionssVo.getDownPayAmounts()); + } else { + downPayAmountsValue = downPayAmountsValue.append("融资首付：").append("-"); + } + list.add(getValueSpanSize(downPayAmountsValue.toString(), 1, 0, false)); + //贷款保证金 + StringBuilder bondAmountsValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getBondAmounts())) { + bondAmountsValue = bondAmountsValue.append("贷款保证金：").append(solutionssVo.getBondAmounts()); + } else { + bondAmountsValue = bondAmountsValue.append("贷款保证金：").append("-"); + } + list.add(getValueSpanSize(bondAmountsValue.toString(), 1, 0, false)); + //保险保证金 + StringBuilder depositPremiumValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getDepositPremium())) { + depositPremiumValue = depositPremiumValue.append("保险保证金：").append(solutionssVo.getDepositPremium()); + } else { + depositPremiumValue = depositPremiumValue.append("保险保证金：").append("-"); + } + list.add(getValueSpanSize(depositPremiumValue.toString(), 1, 0, false)); + //落户保证金 + StringBuilder depositSettleValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getDepositSettle())) { + depositSettleValue = depositSettleValue.append("落户保证金：").append(solutionssVo.getDepositSettle()); + } else { + depositSettleValue = depositSettleValue.append("落户保证金：").append("-"); + } + list.add(getValueSpanSize(depositSettleValue.toString(), 1, 0, false)); + //服务费 + StringBuilder serviceAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getServiceAmount())) { + serviceAmountValue = serviceAmountValue.append("服务费：").append(solutionssVo.getServiceAmount()); + } else { + serviceAmountValue = serviceAmountValue.append("服务费：").append("-"); + } + list.add(getValueSpanSize(serviceAmountValue.toString(), 1, 0, false)); + //代收意外险 + StringBuilder proxyAccidentPremiumValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getProxyAccidentPremium())) { + proxyAccidentPremiumValue = proxyAccidentPremiumValue.append("代收意外险：").append(solutionssVo.getProxyAccidentPremium()); + } else { + proxyAccidentPremiumValue = proxyAccidentPremiumValue.append("代收意外险：").append("-"); + } + list.add(getValueSpanSize(proxyAccidentPremiumValue.toString(), 1, 0, false)); + //上牌费 + StringBuilder registerAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getRegisterAmount())) { + registerAmountValue = registerAmountValue.append("上牌费：").append(solutionssVo.getRegisterAmount()); + } else { + registerAmountValue = registerAmountValue.append("上牌费：").append("-"); + } + list.add(getValueSpanSize(registerAmountValue.toString(), 1, 0, false)); + //运管费 + StringBuilder operationAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOperationAmount())) { + operationAmountValue = operationAmountValue.append("运管费：").append(solutionssVo.getOperationAmount()); + } else { + operationAmountValue = operationAmountValue.append("运管费：").append("-"); + } + list.add(getValueSpanSize(operationAmountValue.toString(), 1, 0, false)); + //补车价 + StringBuilder vehOtherPriceValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getVehOtherPrice())) { + vehOtherPriceValue = vehOtherPriceValue.append("补车价：").append(solutionssVo.getVehOtherPrice()); + } else { + vehOtherPriceValue = vehOtherPriceValue.append("补车价：").append("-"); + } + list.add(getValueSpanSize(vehOtherPriceValue.toString(), 1, 0, false)); + //其它费用 + StringBuilder otherAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOtherAmount())) { + otherAmountValue = otherAmountValue.append("其它费用：").append(solutionssVo.getOtherAmount()); + } else { + otherAmountValue = otherAmountValue.append("其它费用：").append("-"); + } + list.add(getValueSpanSize(otherAmountValue.toString(), 1, 0, false)); + //其它费用说明 + StringBuilder otherAmountRemarkValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOtherAmountRemark())) { + otherAmountRemarkValue = otherAmountRemarkValue.append("其它费用说明：").append(solutionssVo.getOtherAmountRemark()); + } else { + otherAmountRemarkValue = otherAmountRemarkValue.append("其它费用说明：").append("-"); + } + list.add(getValueSpanSize(otherAmountRemarkValue.toString(), 1, 0, false)); + //办理方式选择 + StringBuilder dealWayValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getDealWay())) { + dealWayValue = dealWayValue.append("办理方式选择：").append(solutionssVo.getDealWay()); + } else { + dealWayValue = dealWayValue.append("办理方式选择：").append("-"); + } + list.add(getValueSpanSize(dealWayValue.toString(), 2, 2, false)); + //抵顶费用合计 + StringBuilder proxyTotalValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getProxyTotal())) { + proxyTotalValue = proxyTotalValue.append("代收合计：").append(solutionssVo.getOffsetTotal()); + } else { + proxyTotalValue = proxyTotalValue.append("代收合计：").append("-"); + } + list.add(getValueSpanSize(proxyTotalValue.toString(), 2, 2, false)); + //代收首年保险费 + StringBuilder proxyPremiumValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getProxyPremium())) { + proxyPremiumValue = proxyPremiumValue.append("代收首年保险费：").append(solutionssVo.getProxyPremium()); + } else { + proxyPremiumValue = proxyPremiumValue.append("代收首年保险费：").append("-"); + } + list.add(getValueSpanSize(proxyPremiumValue.toString(), 1, 0, false)); + //代收购置税 + StringBuilder proxyPurchasetaxValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getProxyPurchasetax())) { + proxyPurchasetaxValue = proxyPurchasetaxValue.append("代收购置税：").append(solutionssVo.getProxyPurchasetax()); + } else { + proxyPurchasetaxValue = proxyPurchasetaxValue.append("代收购置税：").append("-"); + } + list.add(getValueSpanSize(proxyPurchasetaxValue.toString(), 1, 0, false)); + //应收合计 + StringBuilder receivableTotalValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getReceivableTotal())) { + receivableTotalValue = receivableTotalValue.append("应收合计：").append(solutionssVo.getReceivableTotal()); + } else { + receivableTotalValue = receivableTotalValue.append("应收合计：").append("-"); + } + list.add(getValueSpanSize(receivableTotalValue.toString(), 2, 0, true)); + + //抵顶费用合计 + StringBuilder offsetTotalValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOffsetTotal())) { + offsetTotalValue = offsetTotalValue.append("抵顶费用合计：").append(solutionssVo.getOffsetTotal()); + } else { + offsetTotalValue = offsetTotalValue.append("抵顶费用合计：").append("-"); + } + list.add(getValueSpanSize(offsetTotalValue.toString(), 2, 2, false)); + //抵顶首年保险费 + StringBuilder offsetPremiumValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOffsetPremium())) { + offsetPremiumValue = offsetPremiumValue.append("抵顶首年保险费：").append(solutionssVo.getOffsetPremium()); + } else { + offsetPremiumValue = offsetPremiumValue.append("抵顶首年保险费：").append("-"); + } + list.add(getValueSpanSize(offsetPremiumValue.toString(), 1, 0, false)); + //抵顶购置税 + StringBuilder offsetPurchasetaxValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getOffsetPurchasetax())) { + offsetPurchasetaxValue = offsetPurchasetaxValue.append("抵顶购置税：").append(solutionssVo.getOffsetPurchasetax()); + } else { + offsetPurchasetaxValue = offsetPurchasetaxValue.append("抵顶购置税：").append("-"); + } + list.add(getValueSpanSize(offsetPurchasetaxValue.toString(), 1, 0, false)); + //实收合计 + StringBuilder realTotalValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getRealTotal())) { + realTotalValue = realTotalValue.append("实收合计：").append(solutionssVo.getRealTotal()); + } else { + realTotalValue = realTotalValue.append("实收合计：").append("-"); + } + list.add(getValueSpanSize(realTotalValue.toString(), 2, 0, true)); + list.add(getValueSpanSize("", 2, 0, false)); + //车辆总价 + StringBuilder vehTotalPriceValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getVehTotalPrice())) { + vehTotalPriceValue = vehTotalPriceValue.append("车辆总价：").append(solutionssVo.getVehTotalPrice()); + } else { + vehTotalPriceValue = vehTotalPriceValue.append("车辆总价：").append("-"); + } + list.add(getValueSpanSize(vehTotalPriceValue.toString(), 2, 0, false)); + //名义留购价 + StringBuilder nominalPriceValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getNominalPrice())) { + nominalPriceValue = nominalPriceValue.append("名义留购价：").append(solutionssVo.getNominalPrice()); + } else { + nominalPriceValue = nominalPriceValue.append("名义留购价：").append("-"); + } + list.add(getValueSpanSize(nominalPriceValue.toString(), 2, 0, false)); + + } else { + //资方及产品政策 + StringBuilder polivyNameValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getPolicyName())) { + polivyNameValue = polivyNameValue.append("资方及产品政策：").append(solutionssVo.getPolicyName()); + } else { + polivyNameValue = polivyNameValue.append("资方及产品政策：").append("-"); + } + list.add(getValueSpanSize(polivyNameValue.toString(), 2, 0, false)); + list.add(getValueSpanSize("融资项目", 2, 1, true)); + //厂家贴息 + StringBuilder factoryDiscountValue = new StringBuilder(); + if (org.apache.commons.lang3.StringUtils.isNotBlank(solutionssVo.getFactoryDiscount())) { + factoryDiscountValue = factoryDiscountValue.append("厂家贴息：").append(solutionssVo.getFactoryDiscount()); + } else { + factoryDiscountValue = factoryDiscountValue.append("厂家贴息：").append("-"); + } + list.add(getValueSpanSize(factoryDiscountValue.toString(), 1, 0, false)); + //厂家贴息用途 + StringBuilder factoryDiscountUseValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getFactoryDiscountUse())) { + factoryDiscountUseValue = factoryDiscountUseValue.append("厂家贴息用途：").append(solutionssVo.getFactoryDiscountUse()); + } else { + factoryDiscountUseValue = factoryDiscountUseValue.append("厂家贴息用途：").append("-"); + } + list.add(getValueSpanSize(factoryDiscountUseValue.toString(), 1, 0, false)); + //贴息抵车款 + StringBuilder factoryDiscountUseMoneyValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getDiscountCar())) { + factoryDiscountUseMoneyValue = factoryDiscountUseValue.append("贴息抵车款：").append(solutionssVo.getDiscountCar()); + } else { + factoryDiscountUseMoneyValue = factoryDiscountUseValue.append("贴息抵车款：").append("-"); + } + list.add(getValueSpanSize(factoryDiscountUseMoneyValue.toString(), 1, 0, false)); + list.add(getValueSpanSize("应收明细", 2, 1, true)); + //服务费 + StringBuilder serviceAmountValue = new StringBuilder(); + if (StringUtils.isNotBlank(solutionssVo.getServiceAmount())) { + serviceAmountValue = serviceAmountValue.append("服务费：").append(solutionssVo.getServiceAmount()); + } else { + serviceAmountValue = serviceAmountValue.append("服务费：").append("-"); + } + list.add(getValueSpanSize(serviceAmountValue.toString(), 2, 0, false)); + + } + return list; + } + + /** + * 金融方案的拼接 + * + * @param value 拼接内容 + * @param spanSize 格数 + * @param type 类型：0 最普通的 1 标题的 2是 加上划线的 + * @param bold 是否加粗：true是，false否 + * @return + */ + private SolutionListVo getValueSpanSize(String value, Integer spanSize, Integer type, boolean bold) { + SolutionListVo orderSolutionVo = new SolutionListVo(); + orderSolutionVo.setValue(value); + orderSolutionVo.setSpanSize(spanSize); + orderSolutionVo.setType(type); + orderSolutionVo.setBold(bold); + return orderSolutionVo; + } + + public ResultBean details2(SolutionssQuery query) { + ResultBean rb = ResultBean.fireFail(); + SolutionssVo solutionssVo = new SolutionssVo(); + BeanUtil.copyProperties(query, solutionssVo); + if (query.isShowMore()) { + CalculateQuery calculateQuery = new CalculateQuery(); + BeanUtil.copyProperties(query, calculateQuery); + ResultBean resultBean = calculate(calculateQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + CalculateVo calculateVo = resultBean.getData(); + BeanUtil.copyProperties(calculateVo, solutionssVo); + } + List formList = getFormList(solutionssVo); + solutionssVo.setFinanceForms(formList); + return rb.success().setData(solutionssVo); + } + /* @Autowired private LoanSolutionsTopService loanSolutionsTopService; @Autowired diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionQuery.java new file mode 100644 index 0000000000..dab3dcd09f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionQuery.java @@ -0,0 +1,114 @@ +package com.yxt.anrui.terminal.api.risk.solutions; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/15 + **/ +@Data +public class AppSolutionQuery implements Query { + private static final long serialVersionUID = 614392826688318560L; + @JsonProperty("isShowMore") + private boolean isShowMore; + @ApiModelProperty("是否打包：1是0否") + private String isPack; + @ApiModelProperty("政策名称") + private String policyName; + @ApiModelProperty("产品政策sid") + private String policySid; + @ApiModelProperty("主车发票价") + private String mainVehicleAmount; + @ApiModelProperty("配件") + private String accessoriesAmount; + @ApiModelProperty("是否有配件") + private boolean accessoriesAmountCb; + @ApiModelProperty("挂车金额") + private String trailerAmount; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("保险金额") + private String premium; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + @ApiModelProperty("购置税") + private String purchaseTax; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("融资项目总额") + private String loanTotal; + @ApiModelProperty("首付金额") + private String downPayAmount; + @ApiModelProperty("贷款金额") + private String loanAmount; + @ApiModelProperty("贷款期数") + private String loanPeriod; + @ApiModelProperty("贷款保证金比例") + private String bondRatio; + @ApiModelProperty("贷款保证金金额") + private String bondAmount; + @ApiModelProperty("厂家贴息") + private String factoryDiscount; + @JsonProperty("factoryDiscountUseMoney") + private String discountCar; + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + + private String downPayRatio; + + private String factoryDiscountUse; + + /*************************其他融和方案汇总*********************************/ + @ApiModelProperty("其它融贷款金额") + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + private boolean otherPolicyIsMain; + private String returnTime; + private String otherPolicySid; + private String otherPolicyName; + + + /*********************************金融方案费用明细*****************************/ + + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + //01公司办理，02自行办理 + @ApiModelProperty("办理方式选择key") + private String dealWayKey; + private String dealWay; + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + @ApiModelProperty("代收购置费") + private String proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private String offsetPremium; + @ApiModelProperty("抵顶购置税") + private String offsetPurchasetax; + @ApiModelProperty("名义留购价") + private String nominalPrice; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java new file mode 100644 index 0000000000..ea387578d8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java @@ -0,0 +1,205 @@ +package com.yxt.anrui.terminal.api.risk.solutions; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSolutionListVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/15 + **/ +@Data +public class AppSolutionVo { + +/* @ApiModelProperty("是否是三方金融") + private boolean finPlanState;*/ + @JsonProperty("isShowMore") + private boolean isShowMore; + + @ApiModelProperty("销售订单sid") + @JsonProperty("saleOrderSid") + private String busSid; + // private String saleOrderSid; +/* @ApiModelProperty("类型：1自营非担保，2外部金融") + private String type; + private String typeKey;*/ + @ApiModelProperty("是否打包，0不打包，1打包") + private String isPack; + @ApiModelProperty("产品政策名称") + private String policyName; + @ApiModelProperty("产品政策sid") + private String policySid; + @ApiModelProperty("主车发票价") + @JsonSerialize(using = ToStringSerializer.class) + private String mainVehicleAmount; + @ApiModelProperty("融资票据") + @JsonSerialize(using = ToStringSerializer.class) + private String accessoriesAmount; + @ApiModelProperty("挂车金额") + @JsonSerialize(using = ToStringSerializer.class) + private String trailerAmount; + @ApiModelProperty("购置税") + @JsonSerialize(using = ToStringSerializer.class) + private String purchaseTax; + @ApiModelProperty("保险金额") + @JsonSerialize(using = ToStringSerializer.class) + private String premium; + @ApiModelProperty("融资项目总额") + @JsonSerialize(using = ToStringSerializer.class) + private String loanTotal; + + @ApiModelProperty("是否有融资票据") + private boolean accessoriesAmountCb; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + + @ApiModelProperty("首付款比例") + private String downPayRatio; + @ApiModelProperty("首付金额") + @JsonSerialize(using = ToStringSerializer.class) + private String downPayAmount; + @ApiModelProperty("贷款金额") + @JsonSerialize(using = ToStringSerializer.class) + private String loanAmount; + @ApiModelProperty("贷款期数") + private String loanPeriod; + @ApiModelProperty("贷款保证金比例") + private String bondRatio; + @ApiModelProperty("贷款保证金金额") + @JsonSerialize(using = ToStringSerializer.class) + private String bondAmount; + @ApiModelProperty("厂家贴息") + @JsonSerialize(using = ToStringSerializer.class) + private String factoryDiscount; + private String factoryDiscountUse; + @ApiModelProperty("年利率") + private String policyYearRatio; + @ApiModelProperty("月还金额") + @JsonSerialize(using = ToStringSerializer.class) + private String loanPayMoney; + @ApiModelProperty("利息总额") + @JsonSerialize(using = ToStringSerializer.class) + private String loanInterest; + @ApiModelProperty("贴息抵车款") + @JsonProperty("factoryDiscountUseMoney") + private String discountCar; + + //其他融 + + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其他融sid") + private String otherPolicySid; + @ApiModelProperty("其它融贷款金额") + @JsonSerialize(using = ToStringSerializer.class) + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融月还") + @JsonSerialize(using = ToStringSerializer.class) + private String otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + @JsonSerialize(using = ToStringSerializer.class) + private String otherPolicyInterest; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + + private boolean otherPolicyIsMain; + + @ApiModelProperty("'融资首付") + @JsonSerialize(using = ToStringSerializer.class) + private String loanDownPay; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + @ApiModelProperty("总贷款金额") + @JsonSerialize(using = ToStringSerializer.class) + private String loanAmountTotal; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("月还金额") + private String monthlyRepay; + @ApiModelProperty("利息总额") + @JsonSerialize(using = ToStringSerializer.class) + private String interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + + //金融方案费用明细 + + @ApiModelProperty("融资首付") + private String downPayAmounts; + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("办理方式选择key") + private String dealWayKey; + @ApiModelProperty("代收合计") + private String proxyTotal; + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + @ApiModelProperty("代收购置费") + private String proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private String offsetPremium; + @ApiModelProperty("抵顶购置税") + private String offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + @JsonSerialize(using = ToStringSerializer.class) + private String offsetTotal; + @ApiModelProperty("应收合计") + @JsonSerialize(using = ToStringSerializer.class) + private String receivableTotal; + @ApiModelProperty("实收合计") + @JsonSerialize(using = ToStringSerializer.class) + private String realTotal; + @ApiModelProperty("车辆总价") + @JsonSerialize(using = ToStringSerializer.class) + private String vehTotalPrice; + @ApiModelProperty("名义留购价") + @JsonSerialize(using = ToStringSerializer.class) + private String nominalPrice; + + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装成交价") + private String szPrice; + + @ApiModelProperty("拼接的List") + private List financeForms = new ArrayList<>(); + + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java index 3ee877f52e..c9fbd3ace7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java @@ -40,4 +40,16 @@ public interface SolutionsFeign { @GetMapping("/selectOtherList") @ResponseBody ResultBean> selectOtherList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name); + + @ApiOperation("初始化金融方案2") + @GetMapping("/selectDetailsVo2") + @ResponseBody + ResultBean selectDetailsVo2(@RequestParam("saleOrderSid") String busSid); + + @ApiOperation("计算") + @GetMapping("/detailsVo2") + @ResponseBody + ResultBean detailsVo2(@RequestBody AppSolutionQuery query); + + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java index ced1c240c7..909e03dca1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java @@ -42,4 +42,14 @@ public class SolutionsRest implements SolutionsFeign { public ResultBean> selectOtherList(String orgPath, String userSid, String sid, String name) { return solutionsService.selectOtherList(orgPath, userSid, sid, name); } + + @Override + public ResultBean selectDetailsVo2(String busSid) { + return solutionsService.selectDetailsVo2(busSid); + } + + @Override + public ResultBean detailsVo2(AppSolutionQuery query) { + return solutionsService.detailsVo2(query); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java index 95127ed1f5..e5b7366c93 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java @@ -8,6 +8,8 @@ import com.yxt.anrui.riskcenter.api.loanfinpolicy.PolicyVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; +import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; import com.yxt.anrui.terminal.api.risk.solutions.*; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; @@ -96,4 +98,30 @@ public class SolutionsService { } return rb.success().setData(listNew); } + + public ResultBean selectDetailsVo2(String busSid) { + ResultBean rb = ResultBean.fireFail(); + AppSolutionVo appSolutionVo = new AppSolutionVo(); + ResultBean resultBean = loanSolutionsFeign.selectDetails2(busSid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + SolutionssVo solutionssVo = resultBean.getData(); + BeanUtil.copyProperties(solutionssVo, appSolutionVo); + return rb.success().setData(appSolutionVo); + } + + public ResultBean detailsVo2(AppSolutionQuery query) { + ResultBean rb = ResultBean.fireFail(); + AppSolutionVo appSolutionVo = new AppSolutionVo(); + SolutionssQuery solutionssQuery = new SolutionssQuery(); + BeanUtil.copyProperties(query, solutionssQuery); + ResultBean resultBean = loanSolutionsFeign.details2(solutionssQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + SolutionssVo solutionssVo = resultBean.getData(); + BeanUtil.copyProperties(solutionssVo, appSolutionVo); + return rb.success().setData(appSolutionVo); + } } From fe7e2a541452056c76745dd0ea878f140e51b43b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 15 Aug 2023 16:56:28 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateFeign.java | 12 ++++++ .../LoanHomeVisitInvestigateInitPropDto.java | 37 ++++++++++++++++ .../LoanHomeVisitInvestigateInitPropVo.java | 37 ++++++++++++++++ .../LoanHomevisitInvestigateProperty.java | 8 ++-- ...HomevisitInvestigatePropertyDetailsVo.java | 8 ++-- .../LoanHomevisitInvestigatePropertyDto.java | 8 ++-- ...LoanHomevisitInvestigatePropertyQuery.java | 8 ++-- .../LoanHomevisitInvestigatePropertyVo.java | 8 ++-- .../LoanHomevisitInvestigateRest.java | 12 ++++++ .../LoanHomevisitInvestigateService.java | 30 +++++++++++++ ...oanHomevisitInvestigatePropertyMapper.java | 3 ++ ...LoanHomevisitInvestigatePropertyMapper.xml | 43 +++++++++++++++---- ...anHomevisitInvestigatePropertyService.java | 11 +++-- ...ppLoanHomeVisitInvestigateInitPropDto.java | 37 ++++++++++++++++ ...AppLoanHomeVisitInvestigateInitPropVo.java | 37 ++++++++++++++++ .../LoanHomeVisitInvestigateFeign.java | 10 +++++ .../LoanHomeVisitInvestigateRest.java | 10 +++++ .../LoanHomeVisitInvestigateService.java | 18 ++++++++ 18 files changed, 302 insertions(+), 35 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index 00eb05d231..9642a6a606 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -29,6 +29,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeV import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import io.swagger.annotations.Api; @@ -141,4 +143,14 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/saveHomeVisitTransportInfo") @ResponseBody public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitTranDto dto); + + @ApiOperation("初始化家访考察资产情况") + @GetMapping("/getHomeVisitAssetsInfo") + @ResponseBody + public ResultBean getHomeVisitAssetsInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察资产情况") + @PostMapping("/saveHomeVisitAssetsInfo") + @ResponseBody + public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitPropDto dto); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropDto.java new file mode 100644 index 0000000000..cad2eee6b7 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitPropDto implements Vo { + + private String sid; + @ApiModelProperty("房产状态") + private Boolean houseCheck; + @ApiModelProperty("产权类型") + private int houseState; + @ApiModelProperty("房产有无贷款value") + private String houseLoan; + @ApiModelProperty("房产有无贷款key") + private String houseLoanKey; + @ApiModelProperty("房产备注") + private String houseRemarks; + @ApiModelProperty("车辆状态") + private Boolean carCheck; + @ApiModelProperty("车辆类型") + private int carState; + @ApiModelProperty("车辆有无贷款value") + private String carLoan; + @ApiModelProperty("车辆有无贷款key") + private String carLoanKey; + @ApiModelProperty("车辆备注") + private String carRemarks; + @ApiModelProperty("首付来源") + private String downPayment; + @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/LoanHomeVisitInvestigateInitPropVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java new file mode 100644 index 0000000000..681de420ec --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomeVisitInvestigateInitPropVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class LoanHomeVisitInvestigateInitPropVo implements Vo { + + private String sid; + @ApiModelProperty("房产状态") + private Boolean houseCheck; + @ApiModelProperty("产权类型") + private int houseState; + @ApiModelProperty("房产有无贷款value") + private String houseLoan; + @ApiModelProperty("房产有无贷款key") + private String houseLoanKey; + @ApiModelProperty("房产备注") + private String houseRemarks; + @ApiModelProperty("车辆状态") + private Boolean carCheck; + @ApiModelProperty("车辆类型") + private int carState; + @ApiModelProperty("车辆有无贷款value") + private String carLoan; + @ApiModelProperty("车辆有无贷款key") + private String carLoanKey; + @ApiModelProperty("车辆备注") + private String carRemarks; + @ApiModelProperty("首付来源") + private String downPayment; + @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/LoanHomevisitInvestigateProperty.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigateProperty.java index 279b65085d..b523400443 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigateProperty.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigateProperty.java @@ -51,17 +51,17 @@ public class LoanHomevisitInvestigateProperty extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("是否是房产") - private String isRealEstate; // 是否是房产 + private Boolean isRealEstate; // 是否是房产 @ApiModelProperty("产权类型") - private String propertyType; // 产权类型 + private int propertyType; // 产权类型 @ApiModelProperty("房产贷款情况") private String realLoanSituation; // 房产贷款情况 @ApiModelProperty("房产备注") private String realRemarks; // 房产备注 @ApiModelProperty("是否是车辆") - private String isCar; // 是否是车辆 + private Boolean isCar; // 是否是车辆 @ApiModelProperty("车辆类型") - private String carType; // 车辆类型 + private int carType; // 车辆类型 @ApiModelProperty("车辆贷款情况") private String carLoanSituation; // 车辆贷款情况 @ApiModelProperty("车辆备注") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDetailsVo.java index a8e88a53bf..510d6cf3aa 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDetailsVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDetailsVo.java @@ -52,17 +52,17 @@ public class LoanHomevisitInvestigatePropertyDetailsVo implements Vo { private String sid; // sid @ApiModelProperty("是否是房产") - private String isRealEstate; // 是否是房产 + private Boolean isRealEstate; // 是否是房产 @ApiModelProperty("产权类型") - private String propertyType; // 产权类型 + private int propertyType; // 产权类型 @ApiModelProperty("房产贷款情况") private String realLoanSituation; // 房产贷款情况 @ApiModelProperty("房产备注") private String realRemarks; // 房产备注 @ApiModelProperty("是否是车辆") - private String isCar; // 是否是车辆 + private Boolean isCar; // 是否是车辆 @ApiModelProperty("车辆类型") - private String carType; // 车辆类型 + private int carType; // 车辆类型 @ApiModelProperty("车辆贷款情况") private String carLoanSituation; // 车辆贷款情况 @ApiModelProperty("车辆备注") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDto.java index fca64fb7b0..a4c7e1778a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDto.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyDto.java @@ -52,17 +52,17 @@ public class LoanHomevisitInvestigatePropertyDto implements Dto { private String sid; // sid @ApiModelProperty("是否是房产") - private String isRealEstate; // 是否是房产 + private Boolean isRealEstate; // 是否是房产 @ApiModelProperty("产权类型") - private String propertyType; // 产权类型 + private int propertyType; // 产权类型 @ApiModelProperty("房产贷款情况") private String realLoanSituation; // 房产贷款情况 @ApiModelProperty("房产备注") private String realRemarks; // 房产备注 @ApiModelProperty("是否是车辆") - private String isCar; // 是否是车辆 + private Boolean isCar; // 是否是车辆 @ApiModelProperty("车辆类型") - private String carType; // 车辆类型 + private int carType; // 车辆类型 @ApiModelProperty("车辆贷款情况") private String carLoanSituation; // 车辆贷款情况 @ApiModelProperty("车辆备注") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyQuery.java index b8d8aaac8d..9c31aaf15e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyQuery.java @@ -50,17 +50,17 @@ import lombok.Data; public class LoanHomevisitInvestigatePropertyQuery implements Query { @ApiModelProperty("是否是房产") - private String isRealEstate; // 是否是房产 + private Boolean isRealEstate; // 是否是房产 @ApiModelProperty("产权类型") - private String propertyType; // 产权类型 + private int propertyType; // 产权类型 @ApiModelProperty("房产贷款情况") private String realLoanSituation; // 房产贷款情况 @ApiModelProperty("房产备注") private String realRemarks; // 房产备注 @ApiModelProperty("是否是车辆") - private String isCar; // 是否是车辆 + private Boolean isCar; // 是否是车辆 @ApiModelProperty("车辆类型") - private String carType; // 车辆类型 + private int carType; // 车辆类型 @ApiModelProperty("车辆贷款情况") private String carLoanSituation; // 车辆贷款情况 @ApiModelProperty("车辆备注") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyVo.java index 7d94909616..0432fae12a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyVo.java @@ -52,17 +52,17 @@ public class LoanHomevisitInvestigatePropertyVo implements Vo { private String sid; // sid @ApiModelProperty("是否是房产") - private String isRealEstate; // 是否是房产 + private Boolean isRealEstate; // 是否是房产 @ApiModelProperty("产权类型") - private String propertyType; // 产权类型 + private int propertyType; // 产权类型 @ApiModelProperty("房产贷款情况") private String realLoanSituation; // 房产贷款情况 @ApiModelProperty("房产备注") private String realRemarks; // 房产备注 @ApiModelProperty("是否是车辆") - private String isCar; // 是否是车辆 + private Boolean isCar; // 是否是车辆 @ApiModelProperty("车辆类型") - private String carType; // 车辆类型 + private int carType; // 车辆类型 @ApiModelProperty("车辆贷款情况") private String carLoanSituation; // 车辆贷款情况 @ApiModelProperty("车辆备注") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index c9cdf53d37..e933f21682 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -30,6 +30,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeV import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.common.core.query.PagerQuery; @@ -158,4 +160,14 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) { return loanHomevisitInvestigateService.saveHomeVisitTransportInfo(dto); } + + @Override + public ResultBean getHomeVisitAssetsInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitAssetsInfo(sid); + } + + @Override + public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitAssetsInfo(dto); + } } 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 ecca749940..9f7b6b6772 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 @@ -45,7 +45,10 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitI import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportDetailsVo; @@ -466,7 +469,34 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitAssetsInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitPropVo loanHomeVisitInvestigateInitPropVo = loanHomevisitInvestigatePropertyService.getHomeVisitAssetsInfo(sid); + loanHomeVisitInvestigateInitPropVo.setMainSid(sid); + return rb.success().setData(loanHomeVisitInvestigateInitPropVo); + } + + public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomevisitInvestigatePropertyDto loanHomevisitInvestigatePropertyDto = new LoanHomevisitInvestigatePropertyDto(); + loanHomevisitInvestigatePropertyDto.setIsRealEstate(dto.getHouseCheck()); + loanHomevisitInvestigatePropertyDto.setPropertyType(dto.getHouseState()); + loanHomevisitInvestigatePropertyDto.setRealLoanSituation(dto.getHouseLoanKey()); + loanHomevisitInvestigatePropertyDto.setRealRemarks(dto.getHouseRemarks()); + loanHomevisitInvestigatePropertyDto.setIsCar(dto.getCarCheck()); + loanHomevisitInvestigatePropertyDto.setCarType(dto.getCarState()); + loanHomevisitInvestigatePropertyDto.setCarLoanSituation(dto.getCarLoanKey()); + loanHomevisitInvestigatePropertyDto.setDownPaySourceKey(dto.getDownPayment()); + loanHomevisitInvestigatePropertyDto.setOtherSourceKey(dto.getOtherIncome()); + BeanUtil.copyProperties(dto,loanHomevisitInvestigatePropertyDto); + loanHomevisitInvestigatePropertyService.saveOrUpdateDto(loanHomevisitInvestigatePropertyDto); + return rb.success(); + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.java index b49ed6b5c0..d965a5ff1c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -66,4 +67,6 @@ public interface LoanHomevisitInvestigatePropertyMapper extends BaseMapper - - - - - + + + + + + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyService.java index 3ff741dba7..c1f20e41b3 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyService.java @@ -28,18 +28,13 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateproperty; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.*; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigateProperty; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyQuery; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDetailsVo; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyDto; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyFeign; import org.springframework.stereotype.Service; @@ -111,4 +106,8 @@ public class LoanHomevisitInvestigatePropertyService extends MybatisBaseService< public LoanHomevisitInvestigatePropertyDetailsVo selByMainSid(String sid) { return baseMapper.selByMainSid(sid); } + + public LoanHomeVisitInvestigateInitPropVo getHomeVisitAssetsInfo(String sid) { + return baseMapper.getHomeVisitAssetsInfo(sid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropDto.java new file mode 100644 index 0000000000..5460fded0b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitPropDto implements Vo { + + private String sid; + @ApiModelProperty("房产状态") + private Boolean houseCheck; + @ApiModelProperty("产权类型") + private int houseState; + @ApiModelProperty("房产有无贷款value") + private String houseLoan; + @ApiModelProperty("房产有无贷款key") + private String houseLoanKey; + @ApiModelProperty("房产备注") + private String houseRemarks; + @ApiModelProperty("车辆状态") + private Boolean carCheck; + @ApiModelProperty("车辆类型") + private int carState; + @ApiModelProperty("车辆有无贷款value") + private String carLoan; + @ApiModelProperty("车辆有无贷款key") + private String carLoanKey; + @ApiModelProperty("车辆备注") + private String carRemarks; + @ApiModelProperty("首付来源") + private String downPayment; + @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/AppLoanHomeVisitInvestigateInitPropVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java new file mode 100644 index 0000000000..1afa7fb723 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitPropVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppLoanHomeVisitInvestigateInitPropVo implements Vo { + + private String sid; + @ApiModelProperty("房产状态") + private Boolean houseCheck; + @ApiModelProperty("产权类型") + private int houseState; + @ApiModelProperty("房产有无贷款value") + private String houseLoan; + @ApiModelProperty("房产有无贷款key") + private String houseLoanKey; + @ApiModelProperty("房产备注") + private String houseRemarks; + @ApiModelProperty("车辆状态") + private Boolean carCheck; + @ApiModelProperty("车辆类型") + private int carState; + @ApiModelProperty("车辆有无贷款value") + private String carLoan; + @ApiModelProperty("车辆有无贷款key") + private String carLoanKey; + @ApiModelProperty("车辆备注") + private String carRemarks; + @ApiModelProperty("首付来源") + private String downPayment; + @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/LoanHomeVisitInvestigateFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java index 179a10c835..cd217a5147 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java @@ -84,4 +84,14 @@ public interface LoanHomeVisitInvestigateFeign { @ResponseBody public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitTranDto dto); + @ApiOperation("初始化家访考察资产情况") + @GetMapping("/getHomeVisitAssetsInfo") + @ResponseBody + public ResultBean getHomeVisitAssetsInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察资产情况") + @PostMapping("/saveHomeVisitAssetsInfo") + @ResponseBody + public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitPropDto dto); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index c1b2c19ac3..156e7d4077 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -97,4 +97,14 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateInitTranDto dto) { return loanHomeVisitInvestigateService.saveHomeVisitTransportInfo(dto); } + + @Override + public ResultBean getHomeVisitAssetsInfo(String sid) { + return loanHomeVisitInvestigateService.getHomeVisitAssetsInfo(sid); + } + + @Override + public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateInitPropDto dto) { + return loanHomeVisitInvestigateService.saveHomeVisitAssetsInfo(dto); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index c34f566cd7..b5c02a2a5c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -32,6 +32,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeV import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*; @@ -180,4 +182,20 @@ public class LoanHomeVisitInvestigateService { loanHomevisitInvestigateFeign.saveHomeVisitTransportInfo(loanHomeVisitInvestigateInitTranDto); return rb.success(); } + + public ResultBean getHomeVisitAssetsInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitPropVo data = loanHomevisitInvestigateFeign.getHomeVisitAssetsInfo(sid).getData(); + AppLoanHomeVisitInvestigateInitPropVo appLoanHomeVisitInvestigateInitPropVo = new AppLoanHomeVisitInvestigateInitPropVo(); + BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitPropVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitPropVo); + } + + public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateInitPropDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitPropDto loanHomeVisitInvestigateInitPropDto = new LoanHomeVisitInvestigateInitPropDto(); + BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitPropDto); + loanHomevisitInvestigateFeign.saveHomeVisitAssetsInfo(loanHomeVisitInvestigateInitPropDto); + return rb.success(); + } } \ No newline at end of file From e85f7a43c390e82736d6a2eb32813f83bdec03e6 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 15 Aug 2023 17:43:13 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loansolutions/LoanSolutionsFeign.java | 7 +- .../LoanSolutionsFeignFallback.java | 7 +- .../api/loansolutions/app/SolutionssDto.java | 162 +++++++++++++++++ .../biz/loansolutions/LoanSolutionsRest.java | 7 +- .../loansolutions/LoanSolutionsService.java | 13 +- .../api/risk/solutions/AppSolutionsDto.java | 1 + .../api/risk/solutions/AppSolutionssDto.java | 165 ++++++++++++++++++ .../api/risk/solutions/SolutionsFeign.java | 7 +- .../biz/risk/solutions/SolutionsRest.java | 5 + .../biz/risk/solutions/SolutionsService.java | 16 +- 10 files changed, 364 insertions(+), 26 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java index 5ab039d819..ec2d10d761 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java @@ -1,9 +1,6 @@ package com.yxt.anrui.riskcenter.api.loansolutions; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.common.core.result.ResultBean; @@ -45,7 +42,7 @@ public interface LoanSolutionsFeign { @ApiOperation("保存金融方案2") @PostMapping("/save2") - ResultBean save2(@RequestBody SolutionsDto dto); + ResultBean save2(@RequestBody SolutionssDto dto); @ApiOperation("根据销售订单sid查询金融方案") @GetMapping("/selectDetailss") diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java index d79f643583..fc24b59a3a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java @@ -1,9 +1,6 @@ package com.yxt.anrui.riskcenter.api.loansolutions; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.common.core.result.ResultBean; @@ -37,7 +34,7 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign { } @Override - public ResultBean save2(SolutionsDto dto) { + public ResultBean save2(SolutionssDto dto) { return null; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java new file mode 100644 index 0000000000..75d87d55f6 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssDto.java @@ -0,0 +1,162 @@ +package com.yxt.anrui.riskcenter.api.loansolutions.app; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/15 + **/ +@Data +public class SolutionssDto implements Dto { + private static final long serialVersionUID = -4329637976311165379L; + + @ApiModelProperty("关联sid") + private String busSid; + @ApiModelProperty("是否打包：1是0否") + private String isPack; + @ApiModelProperty("产品政策名称") + private String policyName; + @ApiModelProperty("产品政策sid") + private String policySid; + @ApiModelProperty("主车发票价") + private String mainVehicleAmount; + @ApiModelProperty("融资票据") + private String accessoriesAmount; + @ApiModelProperty("是否有融资票据") + private boolean accessoriesAmountCb; + @ApiModelProperty("挂车金额") + private String trailerAmount; + @ApiModelProperty("是否有挂车") + private boolean trailerAmountCb; + @ApiModelProperty("保险金额") + private String premium; + @ApiModelProperty("是否有保险") + private boolean premiumCb; + @ApiModelProperty("购置税") + private String purchaseTax; + @ApiModelProperty("是否有购置税") + private boolean purchaseTaxCb; + @ApiModelProperty("融资项目总额") + private String loanTotal; + @ApiModelProperty("首付款比例") + private String downPayRatio; + @ApiModelProperty("首付金额") + @NotBlank(message = "首付金额不能为空") + private String downPayAmount; + @ApiModelProperty("贷款金额") + private String loanAmount; + @ApiModelProperty("贷款期数") + @NotBlank(message = "产品期数不能为空") + private String loanPeriod; + @ApiModelProperty("贷款保证金比例") + private String bondRatio; + @ApiModelProperty("贷款保证金金额") + @NotBlank(message = "贷款保证金不能为空") + private String bondAmount; + @ApiModelProperty("厂家贴息") + @NotBlank(message = "厂家贴息不能为空") + private String factoryDiscount; + @ApiModelProperty("厂家贴息用途") + private String factoryDiscountUse; + @ApiModelProperty("厂家贴息用途") + private String factoryDiscountUseKey; + @ApiModelProperty("年利率") + private String policyYearRatio; + @ApiModelProperty("月还金额") + @NotBlank(message = "月还金额不能为空") + private String loanPayMoney; + @ApiModelProperty("利息总额") + private String loanInterest; + @ApiModelProperty("是否勾选其它融") + private boolean otherPolicyState; + + @ApiModelProperty("贴息抵车款") + private String discountCar; + + /*************************其他融和方案汇总*********************************/ + @ApiModelProperty("其它融名称") + private String otherPolicyName; + @ApiModelProperty("其他融sid") + private String otherPolicySid; + @ApiModelProperty("其它融贷款金额") + private String otherPolicyAmount; + @ApiModelProperty("其它融期数") + private String otherPolicyPeriod; + @ApiModelProperty("其它融月还") + private String otherPolicyMonthlyRepay; + @ApiModelProperty("其它融利息总额") + private String otherPolicyInterest; + @ApiModelProperty("其它融年利率") + private String otherPolicyYearRatio; + + @ApiModelProperty("'融资首付") + private String loanDownPay; + @ApiModelProperty("实际首付比例") + private String downPayAmountsRatio; + @ApiModelProperty("总贷款金额") + private String loanAmountTotal; + @ApiModelProperty("期数") + private String period; + @ApiModelProperty("月还金额") + private String monthlyRepay; + @ApiModelProperty("利息总额") + private String interest; + @ApiModelProperty("预计首期还款日") + private String returnTime; + + + /*********************************金融方案费用明细*****************************/ + + @ApiModelProperty("融资首付") + private String downPayAmounts; + @ApiModelProperty("贷款保证金") + private String bondAmounts; + @ApiModelProperty("保险保证金") + private String depositPremium; + @ApiModelProperty("落户保证金") + private String depositSettle; + @ApiModelProperty("服务费") + @NotBlank(message = "服务费不能为空") + private String serviceAmount; + @ApiModelProperty("代收意外险") + private String proxyAccidentPremium; + @ApiModelProperty("上牌费") + private String registerAmount; + @ApiModelProperty("运管费") + private String operationAmount; + @ApiModelProperty("补车价") + private String vehOtherPrice; + @ApiModelProperty("其它费用") + private String otherAmount; + @ApiModelProperty("其它费用说明") + private String otherAmountRemark; + @ApiModelProperty("办理方式选择") + private String dealWay; + @ApiModelProperty("办理方式选择key") + private String dealWayKey; + @ApiModelProperty("代收合计") + private String proxyTotal; + @ApiModelProperty("代收首年保险费") + private String proxyPremium; + @ApiModelProperty("代收购置费") + private String proxyPurchasetax; + @ApiModelProperty("抵顶首年保险费") + private String offsetPremium; + @ApiModelProperty("抵顶购置税") + private String offsetPurchasetax; + @ApiModelProperty("抵顶费用合计") + private String offsetTotal; + @ApiModelProperty("应收合计") + private String receivableTotal; + @ApiModelProperty("实收合计") + private String realTotal; + @ApiModelProperty("车辆总价") + private String vehTotalPrice; + @ApiModelProperty("名义留购价") + private String nominalPrice; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java index 4d0850b2fa..17b543d1a5 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java @@ -2,10 +2,7 @@ package com.yxt.anrui.riskcenter.biz.loansolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery; import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo; import com.yxt.common.core.result.ResultBean; @@ -48,7 +45,7 @@ public class LoanSolutionsRest implements LoanSolutionsFeign { } @Override - public ResultBean save2(SolutionsDto dto) { + public ResultBean save2(SolutionssDto dto) { return loanSolutionsService.save2(dto); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index c161d0f9bc..8797478e00 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -837,15 +837,16 @@ public class LoanSolutionsService extends MybatisBaseService selectDetailsVo2(@RequestParam("saleOrderSid") String busSid); @ApiOperation("计算") - @GetMapping("/detailsVo2") + @PostMapping("/calc") @ResponseBody ResultBean detailsVo2(@RequestBody AppSolutionQuery query); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java index 909e03dca1..a9e4dc75fa 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java @@ -28,6 +28,11 @@ public class SolutionsRest implements SolutionsFeign { return solutionsService.save(dto); } + @Override + public ResultBean save2(AppSolutionssDto dto) { + return solutionsService.save2(dto); + } + @Override public ResultBean selectDetailsVo(String saleOrderSid) { return solutionsService.selectDetailsVo(saleOrderSid); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java index e5b7366c93..a845646475 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java @@ -6,10 +6,7 @@ import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo; import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign; import com.yxt.anrui.riskcenter.api.loanfinpolicy.PolicyVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssQuery; -import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo; +import com.yxt.anrui.riskcenter.api.loansolutions.app.*; import com.yxt.anrui.terminal.api.risk.solutions.*; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; @@ -124,4 +121,15 @@ public class SolutionsService { BeanUtil.copyProperties(solutionssVo, appSolutionVo); return rb.success().setData(appSolutionVo); } + + public ResultBean save2(AppSolutionssDto dto) { + ResultBean rb = ResultBean.fireFail(); + SolutionssDto solutionsDto = new SolutionssDto(); + BeanUtil.copyProperties(dto, solutionsDto); + ResultBean resultBean = loanSolutionsFeign.save2(solutionsDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); + } } From 3a689115edbc9bd763ce1cd41fd0b4c1585b9384 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 15 Aug 2023 17:43:18 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=AE=B6=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateFeign.java | 31 ++++++ ...LoanHomevisitInvestigateFeignFallback.java | 43 ++++++++ .../LoanHomeVisitInvestigateInitJFJZDto.java | 25 +++++ .../LoanHomeVisitInvestigateInitJFJZVo.java | 25 +++++ .../LoanHomeVisitInvestigateInitZCLDto.java | 19 ++++ .../LoanHomeVisitInvestigateInitZCLVo.java | 19 ++++ .../LoanHomeVisitInvestigateInitZMWJDto.java | 33 +++++++ .../LoanHomeVisitInvestigateInitZMWJVo.java | 33 +++++++ .../LoanHomevisitInvestigateRest.java | 31 ++++++ .../LoanHomevisitInvestigateService.java | 99 ++++++++++++++++++- ...ppLoanHomeVisitInvestigateInitJFJZDto.java | 25 +++++ ...AppLoanHomeVisitInvestigateInitJFJZVo.java | 25 +++++ ...AppLoanHomeVisitInvestigateInitZCLDto.java | 19 ++++ .../AppLoanHomeVisitInvestigateInitZCLVo.java | 19 ++++ ...ppLoanHomeVisitInvestigateInitZMWJDto.java | 33 +++++++ ...AppLoanHomeVisitInvestigateInitZMWJVo.java | 33 +++++++ .../LoanHomeVisitInvestigateFeign.java | 30 ++++++ .../LoanHomeVisitInvestigateRest.java | 30 ++++++ .../LoanHomeVisitInvestigateService.java | 49 +++++++++ 19 files changed, 619 insertions(+), 2 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJDto.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java index 9642a6a606..c011b8356d 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; @@ -153,4 +154,34 @@ public interface LoanHomevisitInvestigateFeign { @PostMapping("/saveHomeVisitAssetsInfo") @ResponseBody public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitPropDto dto); + + @ApiOperation("初始化家访考察家访见证") + @GetMapping("/getHomeVisitWitnessInfo") + @ResponseBody + public ResultBean getHomeVisitWitnessInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察家访见证") + @PostMapping("/saveHomeVisitWitnessInfo") + @ResponseBody + public ResultBean saveHomeVisitWitnessInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitJFJZDto dto); + + @ApiOperation("初始化家访考察证明文件") + @GetMapping("/getHomeVisitProveFileInfo") + @ResponseBody + public ResultBean getHomeVisitProveFileInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察证明文件") + @PostMapping("/saveHomeVisitProveFileInfo") + @ResponseBody + public ResultBean saveHomeVisitProveFileInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitZMWJDto dto); + + @ApiOperation("初始化家访考察资产类") + @GetMapping("/getAssetCertificateInfo") + @ResponseBody + public ResultBean getAssetCertificateInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察资产类") + @PostMapping("/saveAssetCertificateInfo") + @ResponseBody + public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitZCLDto dto); } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java index 0472244094..8ac1692d67 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java @@ -25,10 +25,13 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropDto; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo; import com.yxt.common.core.query.PagerQuery; @@ -135,4 +138,44 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) { return null; } + + @Override + public ResultBean getHomeVisitAssetsInfo(String sid) { + return null; + } + + @Override + public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) { + return null; + } + + @Override + public ResultBean getHomeVisitWitnessInfo(String sid) { + return null; + } + + @Override + public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateInitJFJZDto dto) { + return null; + } + + @Override + public ResultBean getHomeVisitProveFileInfo(String sid) { + return null; + } + + @Override + public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) { + return null; + } + + @Override + public ResultBean getAssetCertificateInfo(String sid) { + return null; + } + + @Override + public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZDto.java new file mode 100644 index 0000000000..cd2cee1e7c --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZDto.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateInitJFJZDto implements Vo { + + private String sid; + @ApiModelProperty("定位信息") + private List location; + @ApiModelProperty("房屋照片") + private List house; + @ApiModelProperty("门口照片") + private List doorway; + @ApiModelProperty("客厅卧室") + 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/LoanHomeVisitInvestigateInitJFJZVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java new file mode 100644 index 0000000000..9279b82092 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitJFJZVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateInitJFJZVo implements Vo { + + private String sid; + @ApiModelProperty("定位信息") + private List location; + @ApiModelProperty("房屋照片") + private List house; + @ApiModelProperty("门口照片") + private List doorway; + @ApiModelProperty("客厅卧室") + 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/LoanHomeVisitInvestigateInitZCLDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLDto.java new file mode 100644 index 0000000000..c3d80aa147 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLDto.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateInitZCLDto implements Vo { + + private String sid; + @ApiModelProperty("房产") + 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/LoanHomeVisitInvestigateInitZCLVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java new file mode 100644 index 0000000000..31b3e49c78 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZCLVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateInitZCLVo implements Vo { + + private String sid; + @ApiModelProperty("房产") + 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/LoanHomeVisitInvestigateInitZMWJDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJDto.java new file mode 100644 index 0000000000..71d0169a64 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateInitZMWJDto implements Vo { + + private String sid; + @ApiModelProperty("贷款人身份证") + private List lenderIdCard; + @ApiModelProperty("贷款人户口本") + private List lenderAccount; + @ApiModelProperty("贷款人婚姻证明") + private List lenderMarriageCertificate; + @ApiModelProperty("贷款人驾驶本") + private List lenderDriverBook; + @ApiModelProperty("贷款人银行流水") + private List lenderBankStatement; + @ApiModelProperty("配偶身份证") + private List spouseIdCard; + @ApiModelProperty("配偶户口本") + private List spouseAccount; + @ApiModelProperty("担保人身份证") + 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/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java new file mode 100644 index 0000000000..5e581b7e7a --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigatefile/LoanHomeVisitInvestigateInitZMWJVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class LoanHomeVisitInvestigateInitZMWJVo implements Vo { + + private String sid; + @ApiModelProperty("贷款人身份证") + private List lenderIdCard; + @ApiModelProperty("贷款人户口本") + private List lenderAccount; + @ApiModelProperty("贷款人婚姻证明") + private List lenderMarriageCertificate; + @ApiModelProperty("贷款人驾驶本") + private List lenderDriverBook; + @ApiModelProperty("贷款人银行流水") + private List lenderBankStatement; + @ApiModelProperty("配偶身份证") + private List spouseIdCard; + @ApiModelProperty("配偶户口本") + private List spouseAccount; + @ApiModelProperty("担保人身份证") + private List guarantorIdCard; + @ApiModelProperty("担保人户口本") + private List guarantorAccount; + @ApiModelProperty("家访考察表sid") + private String mainSid; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java index e933f21682..fdac8d7c3b 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; @@ -170,4 +171,34 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) { return loanHomevisitInvestigateService.saveHomeVisitAssetsInfo(dto); } + + @Override + public ResultBean getHomeVisitWitnessInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitWitnessInfo(sid); + } + + @Override + public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateInitJFJZDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitWitnessInfo(dto); + } + + @Override + public ResultBean getHomeVisitProveFileInfo(String sid) { + return loanHomevisitInvestigateService.getHomeVisitProveFileInfo(sid); + } + + @Override + public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) { + return loanHomevisitInvestigateService.saveHomeVisitProveFileInfo(dto); + } + + @Override + public ResultBean getAssetCertificateInfo(String sid) { + return loanHomevisitInvestigateService.getAssetCertificateInfo(sid); + } + + @Override + public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) { + return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto); + } } 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 9f7b6b6772..598acddf73 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 @@ -33,8 +33,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDto; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanAttachTypeEnum; -import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsDetailsVo; @@ -499,4 +498,100 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService getHomeVisitWitnessInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitJFJZVo loanHomeVisitInvestigateInitJFJZVo = new LoanHomeVisitInvestigateInitJFJZVo(); + //定位信息 + List dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType()); + List location = new ArrayList<>(); + if (dwxxImages != null && dwxxImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) { + location.add(dwxxImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitJFJZVo.setLocation(location); + //房屋照片 + List fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType()); + List house = new ArrayList<>(); + if (fwzpImages != null && fwzpImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) { + house.add(fwzpImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitJFJZVo.setHouse(house); + //门口照片 + List mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType()); + List doorway = new ArrayList<>(); + if (mkzpImages != null && mkzpImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) { + doorway.add(mkzpImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitJFJZVo.setDoorway(doorway); + //客厅卧室照片 + List ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType()); + List indoor = new ArrayList<>(); + if (ktwszpImages != null && ktwszpImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) { + indoor.add(ktwszpImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitJFJZVo.setIndoor(indoor); + //合影照等 + List hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType()); + List groupPhoto = new ArrayList<>(); + if (hyzdImages != null && hyzdImages.size() > 0){ + for (LoanHomevisitInvestigateFileDetailsVo hyzdImage : hyzdImages) { + groupPhoto.add(hyzdImage.getFileUrl()); + } + } + loanHomeVisitInvestigateInitJFJZVo.setGroupPhoto(groupPhoto); + loanHomeVisitInvestigateInitJFJZVo.setMainSid(sid); + return rb.success().setData(loanHomeVisitInvestigateInitJFJZVo); + } + + public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateInitJFJZDto dto) { + return null; + } + + public ResultBean getHomeVisitProveFileInfo(String sid) { + //贷款人身份证 + List dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType()); + //贷款人户口本 + List dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType()); + //贷款人婚姻证明 + List dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType()); + //贷款人驾驶本 + List dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType()); + //贷款人银行流水 + List dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType()); + //配偶身份证 + List posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType()); + //配偶户口本 + List pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType()); + //担保人身份证 + List dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType()); + //担保人户口本 + List dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType()); + return null; + } + + public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) { + return null; + } + + public ResultBean getAssetCertificateInfo(String sid) { + //银行卡 + List yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType()); + //房产 + List fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType()); + //车辆 + List clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType()); + return null; + } + + public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZDto.java new file mode 100644 index 0000000000..639849a57a --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZDto.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateInitJFJZDto implements Vo { + + private String sid; + @ApiModelProperty("定位信息") + private List location; + @ApiModelProperty("房屋照片") + private List house; + @ApiModelProperty("门口照片") + private List doorway; + @ApiModelProperty("客厅卧室") + 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/AppLoanHomeVisitInvestigateInitJFJZVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java new file mode 100644 index 0000000000..56c0f3e1f0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitJFJZVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateInitJFJZVo implements Vo { + + private String sid; + @ApiModelProperty("定位信息") + private List location; + @ApiModelProperty("房屋照片") + private List house; + @ApiModelProperty("门口照片") + private List doorway; + @ApiModelProperty("客厅卧室") + 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/AppLoanHomeVisitInvestigateInitZCLDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLDto.java new file mode 100644 index 0000000000..f04e002968 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLDto.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateInitZCLDto implements Vo { + + private String sid; + @ApiModelProperty("房产") + 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/AppLoanHomeVisitInvestigateInitZCLVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java new file mode 100644 index 0000000000..25c3a11a77 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZCLVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateInitZCLVo implements Vo { + + private String sid; + @ApiModelProperty("房产") + 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/AppLoanHomeVisitInvestigateInitZMWJDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJDto.java new file mode 100644 index 0000000000..3f67e82d0b --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateInitZMWJDto implements Vo { + + private String sid; + @ApiModelProperty("贷款人身份证") + private List lenderIdCard; + @ApiModelProperty("贷款人户口本") + private List lenderAccount; + @ApiModelProperty("贷款人婚姻证明") + private List lenderMarriageCertificate; + @ApiModelProperty("贷款人驾驶本") + private List lenderDriverBook; + @ApiModelProperty("贷款人银行流水") + private List lenderBankStatement; + @ApiModelProperty("配偶身份证") + private List spouseIdCard; + @ApiModelProperty("配偶户口本") + private List spouseAccount; + @ApiModelProperty("担保人身份证") + 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/AppLoanHomeVisitInvestigateInitZMWJVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java new file mode 100644 index 0000000000..10e71b6a7e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitZMWJVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppLoanHomeVisitInvestigateInitZMWJVo implements Vo { + + private String sid; + @ApiModelProperty("贷款人身份证") + private List lenderIdCard; + @ApiModelProperty("贷款人户口本") + private List lenderAccount; + @ApiModelProperty("贷款人婚姻证明") + private List lenderMarriageCertificate; + @ApiModelProperty("贷款人驾驶本") + private List lenderDriverBook; + @ApiModelProperty("贷款人银行流水") + private List lenderBankStatement; + @ApiModelProperty("配偶身份证") + private List spouseIdCard; + @ApiModelProperty("配偶户口本") + private List spouseAccount; + @ApiModelProperty("担保人身份证") + 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/LoanHomeVisitInvestigateFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java index cd217a5147..30e26f856b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java @@ -94,4 +94,34 @@ public interface LoanHomeVisitInvestigateFeign { @ResponseBody public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitPropDto dto); + @ApiOperation("初始化家访考察家访见证") + @GetMapping("/getHomeVisitWitnessInfo") + @ResponseBody + public ResultBean getHomeVisitWitnessInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察家访见证") + @PostMapping("/saveHomeVisitWitnessInfo") + @ResponseBody + public ResultBean saveHomeVisitWitnessInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitJFJZDto dto); + + @ApiOperation("初始化家访考察证明文件") + @GetMapping("/getHomeVisitProveFileInfo") + @ResponseBody + public ResultBean getHomeVisitProveFileInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察证明文件") + @PostMapping("/saveHomeVisitProveFileInfo") + @ResponseBody + public ResultBean saveHomeVisitProveFileInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitZMWJDto dto); + + @ApiOperation("初始化家访考察资产类") + @GetMapping("/getAssetCertificateInfo") + @ResponseBody + public ResultBean getAssetCertificateInfo(@RequestParam("sid") String sid); + + @ApiOperation("保存家访考察资产类") + @PostMapping("/saveAssetCertificateInfo") + @ResponseBody + public ResultBean saveAssetCertificateInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitZCLDto dto); + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java index 156e7d4077..b71ad5e974 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java @@ -107,4 +107,34 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateInitPropDto dto) { return loanHomeVisitInvestigateService.saveHomeVisitAssetsInfo(dto); } + + @Override + public ResultBean getHomeVisitWitnessInfo(String sid) { + return loanHomeVisitInvestigateService.getHomeVisitWitnessInfo(sid); + } + + @Override + public ResultBean saveHomeVisitWitnessInfo(AppLoanHomeVisitInvestigateInitJFJZDto dto) { + return loanHomeVisitInvestigateService.saveHomeVisitWitnessInfo(dto); + } + + @Override + public ResultBean getHomeVisitProveFileInfo(String sid) { + return loanHomeVisitInvestigateService.getHomeVisitProveFileInfo(sid); + } + + @Override + public ResultBean saveHomeVisitProveFileInfo(AppLoanHomeVisitInvestigateInitZMWJDto dto) { + return loanHomeVisitInvestigateService.saveHomeVisitProveFileInfo(dto); + } + + @Override + public ResultBean getAssetCertificateInfo(String sid) { + return loanHomeVisitInvestigateService.getAssetCertificateInfo(sid); + } + + @Override + public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateInitZCLDto dto) { + return loanHomeVisitInvestigateService.saveAssetCertificateInfo(dto); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java index b5c02a2a5c..f186d5b34d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java @@ -28,6 +28,7 @@ package com.yxt.anrui.terminal.biz.risk.loanhomevisitinvestigate; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.*; +import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.*; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperDto; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderDto; @@ -198,4 +199,52 @@ public class LoanHomeVisitInvestigateService { loanHomevisitInvestigateFeign.saveHomeVisitAssetsInfo(loanHomeVisitInvestigateInitPropDto); return rb.success(); } + + public ResultBean getHomeVisitWitnessInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitJFJZVo data = loanHomevisitInvestigateFeign.getHomeVisitWitnessInfo(sid).getData(); + AppLoanHomeVisitInvestigateInitJFJZVo appLoanHomeVisitInvestigateInitJFJZVo = new AppLoanHomeVisitInvestigateInitJFJZVo(); + BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitJFJZVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitJFJZVo); + } + + public ResultBean saveHomeVisitWitnessInfo(AppLoanHomeVisitInvestigateInitJFJZDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitJFJZDto loanHomeVisitInvestigateInitJFJZDto = new LoanHomeVisitInvestigateInitJFJZDto(); + BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitJFJZDto); + loanHomevisitInvestigateFeign.saveHomeVisitWitnessInfo(loanHomeVisitInvestigateInitJFJZDto); + return rb.success(); + } + + public ResultBean getHomeVisitProveFileInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitZMWJVo data = loanHomevisitInvestigateFeign.getHomeVisitProveFileInfo(sid).getData(); + AppLoanHomeVisitInvestigateInitZMWJVo appLoanHomeVisitInvestigateInitZMWJVo = new AppLoanHomeVisitInvestigateInitZMWJVo(); + BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitZMWJVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitZMWJVo); + } + + public ResultBean saveHomeVisitProveFileInfo(AppLoanHomeVisitInvestigateInitZMWJDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitZMWJDto loanHomeVisitInvestigateInitZMWJDto = new LoanHomeVisitInvestigateInitZMWJDto(); + BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitZMWJDto); + loanHomevisitInvestigateFeign.saveHomeVisitProveFileInfo(loanHomeVisitInvestigateInitZMWJDto); + return rb.success(); + } + + public ResultBean getAssetCertificateInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitZCLVo data = loanHomevisitInvestigateFeign.getAssetCertificateInfo(sid).getData(); + AppLoanHomeVisitInvestigateInitZCLVo appLoanHomeVisitInvestigateInitZCLVo = new AppLoanHomeVisitInvestigateInitZCLVo(); + BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitZCLVo); + return rb.success().setData(appLoanHomeVisitInvestigateInitZCLVo); + } + + public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateInitZCLDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanHomeVisitInvestigateInitZCLDto loanHomeVisitInvestigateInitZCLDto = new LoanHomeVisitInvestigateInitZCLDto(); + BeanUtil.copyProperties(dto,loanHomeVisitInvestigateInitZCLDto); + loanHomevisitInvestigateFeign.saveAssetCertificateInfo(loanHomeVisitInvestigateInitZCLDto); + return rb.success(); + } } \ No newline at end of file