Merge remote-tracking branch 'origin/master'

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;
+
+
 }

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<BusSalesOrderMapper
                     } else {
                         otherPolicyMonthlyRepayValue = otherPolicyMonthlyRepayValue.append("月还金额：").append("-");
                     }
-                    list.add(getValueSpanSize(otherPolicyPeriodValue.toString(), 2, 0, false));
+                    list.add(getValueSpanSize(otherPolicyMonthlyRepayValue.toString(), 2, 0, false));
                 }
                 //方案汇总
                 list.add(getValueSpanSize("方案汇总", 2, 1, true));
@@ -7069,6 +7069,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         busSalesOrdersVo.setBusSalesOrderPrice(busSalesOrderPrice);
         BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.selectBySid(sid);
         busSalesOrdersVo.setBusSalesOrderMakeup(busSalesOrderMakeup);
+        if(busSalesOrderMakeup != null){
+            if(busSalesOrderMakeup.getTopPrice() != null){
+                busSalesOrdersVo.setSzPrice(busSalesOrderMakeup.getTopPrice().toString());
+            }
+        }
+        if(busSalesOrderModel != null){
+            if(busSalesOrderModel.getFinalPrice() != null){
+                busSalesOrdersVo.setFinalPrice(busSalesOrderModel.getFinalPrice().toString());
+            }
+        }
         return rb.success().setData(busSalesOrdersVo);
     }
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitCustomerVo.java

@@ -0,0 +1,69 @@
+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<String> bankCardImages = new ArrayList<>();
+    @ApiModelProperty("配偶姓名")
+    private String spouseName;
+    @ApiModelProperty("配偶身份证")
+    private String spouseIdCard;
+    @ApiModelProperty("配偶电话")
+    private String spouseMobile;
+    @ApiModelProperty("配偶职业")
+    private String spouseJob;
+    @ApiModelProperty("配偶户籍地址")
+    private String spouseDomAddress;
+    @ApiModelProperty("配偶现住址")
+    private String spousePreAddress;
+    @ApiModelProperty("其他人员")
+    private List<LoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel = new ArrayList<>();
+    @ApiModelProperty("紧急联系人姓名")
+    private String emergencyContactName;
+    @ApiModelProperty("紧急联系人电话")
+    private String emergencyContactMobile;
+    @ApiModelProperty("紧急联系人类型value")
+    private String emergencyContactType;
+    @ApiModelProperty("紧急联系人类型key")
+    private String emergencyContactTypeKey;
+}

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.LoanHomeVisitInvestigateInitOtherPeoDto;
+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<String> bankCardImages = new ArrayList<>();
+    @ApiModelProperty("配偶姓名")
+    private String spouseName;
+    @ApiModelProperty("配偶身份证")
+    private String spouseIdCard;
+    @ApiModelProperty("配偶电话")
+    private String spouseMobile;
+    @ApiModelProperty("配偶职业")
+    private String spouseJob;
+    @ApiModelProperty("其他人员")
+    private List<LoanHomeVisitInvestigateInitOtherPeoDto> 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;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeign.java

@@ -25,6 +25,15 @@
  *********************************************************/
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;
@@ -95,4 +104,84 @@ public interface LoanHomevisitInvestigateFeign {
     @GetMapping("/getHomeVisitDataInfo")
     @ResponseBody
     public ResultBean<LoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("初始化家访考察客户信息")
+    @GetMapping("/getHomeVisitCustomerInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitCustomerVo> getHomeVisitCustomerInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察客户信息")
+    @PostMapping("/saveHomeVisitCustomerInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitCustomerInfo(@Valid @RequestBody LoanHomeVisitInvestigateSaveCustomerDto dto);
+
+    @ApiOperation("初始化家访考察订单信息")
+    @GetMapping("/getHomeVisitOrderInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察订单信息")
+    @PostMapping("/saveHomeVisitOrderInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitOrderInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitOrderDto dto);
+
+    @ApiOperation("初始化家访考察运营经历")
+    @GetMapping("/getHomeVisitOperationInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitOperVo> getHomeVisitOperationInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察运营经历")
+    @PostMapping("/saveHomeVisitOperationInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitOperDto dto);
+
+    @ApiOperation("初始化家访考察运输信息")
+    @GetMapping("/getHomeVisitTransportInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitTranVo> getHomeVisitTransportInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察运输信息")
+    @PostMapping("/saveHomeVisitTransportInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitTranDto dto);
+
+    @ApiOperation("初始化家访考察资产情况")
+    @GetMapping("/getHomeVisitAssetsInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitPropVo> getHomeVisitAssetsInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察资产情况")
+    @PostMapping("/saveHomeVisitAssetsInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitPropDto dto);
+
+    @ApiOperation("初始化家访考察家访见证")
+    @GetMapping("/getHomeVisitWitnessInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitJFJZVo> getHomeVisitWitnessInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察家访见证")
+    @PostMapping("/saveHomeVisitWitnessInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitWitnessInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitJFJZDto dto);
+
+    @ApiOperation("初始化家访考察证明文件")
+    @GetMapping("/getHomeVisitProveFileInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitZMWJVo> getHomeVisitProveFileInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察证明文件")
+    @PostMapping("/saveHomeVisitProveFileInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitProveFileInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitZMWJDto dto);
+
+    @ApiOperation("初始化家访考察资产类")
+    @GetMapping("/getAssetCertificateInfo")
+    @ResponseBody
+    public ResultBean<LoanHomeVisitInvestigateInitZCLVo> getAssetCertificateInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察资产类")
+    @PostMapping("/saveAssetCertificateInfo")
+    @ResponseBody
+    public ResultBean saveAssetCertificateInfo(@Valid @RequestBody LoanHomeVisitInvestigateInitZCLDto dto);
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomevisitInvestigateFeignFallback.java

@@ -25,6 +25,15 @@
  *********************************************************/
 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;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -89,4 +98,84 @@ public class LoanHomevisitInvestigateFeignFallback implements LoanHomevisitInves
 	public ResultBean<LoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitCustomerVo> getHomeVisitCustomerInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateInitOrderDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitOperVo> getHomeVisitOperationInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitTranVo> getHomeVisitTransportInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitPropVo> getHomeVisitAssetsInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitJFJZVo> getHomeVisitWitnessInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateInitJFJZDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitZMWJVo> getHomeVisitProveFileInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitZCLVo> getAssetCertificateInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) {
+		return null;
+	}
 }

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("借款人姓名")

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("借款人姓名")

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("借款人姓名")

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("借款人姓名")

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("借款人姓名")

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<String> location;
+    @ApiModelProperty("房屋照片")
+    private List<String> house;
+    @ApiModelProperty("门口照片")
+    private List<String> doorway;
+    @ApiModelProperty("客厅卧室")
+    private List<String> indoor;
+    @ApiModelProperty("合影照等")
+    private List<String> groupPhoto;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> location;
+    @ApiModelProperty("房屋照片")
+    private List<String> house;
+    @ApiModelProperty("门口照片")
+    private List<String> doorway;
+    @ApiModelProperty("客厅卧室")
+    private List<String> indoor;
+    @ApiModelProperty("合影照等")
+    private List<String> groupPhoto;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> houseProperty;
+    @ApiModelProperty("车辆")
+    private List<String> carProperty;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> houseProperty;
+    @ApiModelProperty("车辆")
+    private List<String> carProperty;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> lenderIdCard;
+    @ApiModelProperty("贷款人户口本")
+    private List<String> lenderAccount;
+    @ApiModelProperty("贷款人婚姻证明")
+    private List<String> lenderMarriageCertificate;
+    @ApiModelProperty("贷款人驾驶本")
+    private List<String> lenderDriverBook;
+    @ApiModelProperty("贷款人银行流水")
+    private List<String> lenderBankStatement;
+    @ApiModelProperty("配偶身份证")
+    private List<String> spouseIdCard;
+    @ApiModelProperty("配偶户口本")
+    private List<String> spouseAccount;
+    @ApiModelProperty("担保人身份证")
+    private List<String> guarantorIdCard;
+    @ApiModelProperty("担保人户口本")
+    private List<String> guarantorAccount;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> lenderIdCard;
+    @ApiModelProperty("贷款人户口本")
+    private List<String> lenderAccount;
+    @ApiModelProperty("贷款人婚姻证明")
+    private List<String> lenderMarriageCertificate;
+    @ApiModelProperty("贷款人驾驶本")
+    private List<String> lenderDriverBook;
+    @ApiModelProperty("贷款人银行流水")
+    private List<String> lenderBankStatement;
+    @ApiModelProperty("配偶身份证")
+    private List<String> spouseIdCard;
+    @ApiModelProperty("配偶户口本")
+    private List<String> spouseAccount;
+    @ApiModelProperty("担保人身份证")
+    private List<String> guarantorIdCard;
+    @ApiModelProperty("担保人户口本")
+    private List<String> guarantorAccount;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateotherpeo/LoanHomeVisitInvestigateInitOtherPeoVo.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 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 peoDomAddress;
+    @ApiModelProperty("现住址")
+    private String address;
+    @ApiModelProperty("公司")
+    private String company;
+    @ApiModelProperty("职业")
+    private String job;
+}

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;
+}

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;
+}

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("车辆备注")

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("车辆备注")

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("车辆备注")

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("车辆备注")

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("车辆备注")

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;
+}

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;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java

@@ -1,7 +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.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
 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;
@@ -43,7 +42,7 @@ public interface LoanSolutionsFeign {
 
     @ApiOperation("保存金融方案2")
     @PostMapping("/save2")
-    ResultBean save2(@RequestBody SolutionsDto dto);
+    ResultBean save2(@RequestBody SolutionssDto dto);
 
     @ApiOperation("根据销售订单sid查询金融方案")
     @GetMapping("/selectDetailss")
@@ -107,4 +106,13 @@ public interface LoanSolutionsFeign {
     @PostMapping("/calculate")
     ResultBean<CalculateVo> calculate(@RequestBody CalculateQuery query);
 
+    @ApiOperation("销售订单金融方案初始化2")
+    @PostMapping("/selectDetails2")
+    ResultBean<SolutionssVo> selectDetails2(@RequestParam("salesOrderSid") String busSid);
+
+    @ApiOperation("移动端计算初始化")
+    @PostMapping("/details2")
+    ResultBean<SolutionssVo> details2(@RequestBody SolutionssQuery query);
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java

@@ -1,7 +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.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
 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;
@@ -35,7 +34,7 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
     }
 
     @Override
-    public ResultBean save2(SolutionsDto dto) {
+    public ResultBean save2(SolutionssDto dto) {
         return null;
     }
 
@@ -74,6 +73,16 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<SolutionssVo> selectDetails2(String busSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<SolutionssVo> details2(SolutionssQuery query) {
+        return null;
+    }
+
   /*  @Override
     public ResultBean<PagerVo<LoanSolutionsVo>> listPage(PagerQuery<LoanSolutionsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

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;
+}

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;
+}

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;
+}

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<SolutionListVo> financeForms = new ArrayList<>();
+
+}

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<LoanHomevisit
 
     @Update("update loan_homevisit_investigate set resHomeVisDate = #{times},homeVisAddress = #{adress} where sid = #{sid}")
     void saveAppointmentInfo(@Param("sid") String sid, @Param("times") String times, @Param("adress") String adress);
+
+    LoanHomeVisitInvestigateInitCustomerVo getHomeVisitCustomerInfo(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.xml

@@ -38,4 +38,36 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="getHomeVisitCustomerInfo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomeVisitInvestigateInitCustomerVo">
+        SELECT sid,
+               isConfirmRealBuyer  AS actualBuyer,
+               borrowerSid         AS lenderSid,
+               borrowerName        AS lenderNam,
+               borrowerIdNumber    AS idNumber,
+               borrowerMobile      AS mobile,
+               borrowerCareerKey   AS lenderJobKey,
+               borrowerCareerValue AS lenderJob,
+               maritalStatusKey    AS marriageTypeKey,
+               maritalStatusValue  AS marriageType,
+               isChildrenKey       AS childrenKey,
+               isChildrenValue     AS children,
+               borrowerDomAddress  AS koseki,
+               borrowerPreAddress  AS address,
+               depositBank         AS invoBank,
+               bankCardNo          AS bankNumber,
+               spouseName,
+               spouseIdNumber      AS spouseIdCard,
+               spouseMobile,
+               spouseCareerValue   AS spouseJob,
+               spouseDomAddress,
+               spousePreAddress,
+               emergencyContact    AS emergencyContactName,
+               emergencyMobile     AS emergencyContactMobile,
+               relationshipKey     AS emergencyContactTypeKey,
+               relationshipValue   AS emergencyContactType
+        FROM loan_homevisit_investigate_customer
+        WHERE mainSid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateRest.java

@@ -26,6 +26,15 @@
 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;
+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;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -112,4 +121,84 @@ public class LoanHomevisitInvestigateRest implements LoanHomevisitInvestigateFei
 	public ResultBean<LoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(String sid) {
 		return loanHomevisitInvestigateService.getHomeVisitDataInfo(sid);
 	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitCustomerVo> getHomeVisitCustomerInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitCustomerInfo(sid);
+	}
+
+	@Override
+	public ResultBean saveHomeVisitCustomerInfo(LoanHomeVisitInvestigateSaveCustomerDto dto) {
+		return loanHomevisitInvestigateService.saveHomeVisitCustomerInfo(dto);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitOrderInfo(sid);
+	}
+
+	@Override
+	public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateInitOrderDto dto) {
+		return loanHomevisitInvestigateService.saveHomeVisitOrderInfo(dto);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitOperVo> getHomeVisitOperationInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitOperationInfo(sid);
+	}
+
+	@Override
+	public ResultBean saveHomeVisitOperationInfo(LoanHomeVisitInvestigateInitOperDto dto) {
+		return loanHomevisitInvestigateService.saveHomeVisitOperationInfo(dto);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitTranVo> getHomeVisitTransportInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitTransportInfo(sid);
+	}
+
+	@Override
+	public ResultBean saveHomeVisitTransportInfo(LoanHomeVisitInvestigateInitTranDto dto) {
+		return loanHomevisitInvestigateService.saveHomeVisitTransportInfo(dto);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitPropVo> getHomeVisitAssetsInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitAssetsInfo(sid);
+	}
+
+	@Override
+	public ResultBean saveHomeVisitAssetsInfo(LoanHomeVisitInvestigateInitPropDto dto) {
+		return loanHomevisitInvestigateService.saveHomeVisitAssetsInfo(dto);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitJFJZVo> getHomeVisitWitnessInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitWitnessInfo(sid);
+	}
+
+	@Override
+	public ResultBean saveHomeVisitWitnessInfo(LoanHomeVisitInvestigateInitJFJZDto dto) {
+		return loanHomevisitInvestigateService.saveHomeVisitWitnessInfo(dto);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitZMWJVo> getHomeVisitProveFileInfo(String sid) {
+		return loanHomevisitInvestigateService.getHomeVisitProveFileInfo(sid);
+	}
+
+	@Override
+	public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) {
+		return loanHomevisitInvestigateService.saveHomeVisitProveFileInfo(dto);
+	}
+
+	@Override
+	public ResultBean<LoanHomeVisitInvestigateInitZCLVo> getAssetCertificateInfo(String sid) {
+		return loanHomevisitInvestigateService.getAssetCertificateInfo(sid);
+	}
+
+	@Override
+	public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) {
+		return loanHomevisitInvestigateService.saveAssetCertificateInfo(dto);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -32,17 +32,32 @@ 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.loanhomevisitinvestigatefile.LoanAttachTypeEnum;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDto;
-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;
+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.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;
+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;
 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 +70,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 +103,8 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     private LoanHomevisitInvestigatePropertyService loanHomevisitInvestigatePropertyService;
     @Autowired
     private LoanHomevisitInvestigateFileService loanHomevisitInvestigateFileService;
+    @Autowired
+    private LoanHomevisitInvestigateOtherpeoService loanHomevisitInvestigateOtherpeoService;
 
     public PagerVo<LoanHomevisitInvestigateVo> listPageVo(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
         LoanHomevisitInvestigateQuery query = pq.getParams();
@@ -343,4 +361,237 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         }
         return rb.success().setData(loanHomeVisitInvestigateInitInformationStateVo);
     }
+
+    public ResultBean<LoanHomeVisitInvestigateInitCustomerVo> getHomeVisitCustomerInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitCustomerVo loanHomeVisitInvestigateInitCustomerVo = baseMapper.getHomeVisitCustomerInfo(sid);
+        //银行卡附件
+        List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
+        List<String> bankCardImages = new ArrayList<>();
+        if (loanHomevisitInvestigateFileDetailsVos != null && loanHomevisitInvestigateFileDetailsVos.size() > 0) {
+            for (LoanHomevisitInvestigateFileDetailsVo loanHomevisitInvestigateFileDetailsVo : loanHomevisitInvestigateFileDetailsVos) {
+                bankCardImages.add(loanHomevisitInvestigateFileDetailsVo.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitCustomerVo.setBankCardImages(bankCardImages);
+        //其他人员
+        List<LoanHomeVisitInvestigateInitOtherPeoVo> 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();
+    }
+
+    public ResultBean<LoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitOrderVo loanHomeVisitInvestigateInitOrderVos = loanHomevisitInvestigateOrderService.getHomeVisitOrderInfo(sid);
+        loanHomeVisitInvestigateInitOrderVos.setMainSid(sid);
+        return rb.success().setData(loanHomeVisitInvestigateInitOrderVos);
+    }
+
+    public ResultBean saveHomeVisitOrderInfo(LoanHomeVisitInvestigateInitOrderDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomevisitInvestigateOrderDto loanHomevisitInvestigateOrderDto = new LoanHomevisitInvestigateOrderDto();
+        BeanUtil.copyProperties(dto,loanHomevisitInvestigateOrderDto);
+        loanHomevisitInvestigateOrderDto.setCarConfirm(dto.getCarInfoKey());
+        loanHomevisitInvestigateOrderDto.setCarRemarks(dto.getCarInfoRemarks());
+        loanHomevisitInvestigateOrderDto.setFinConfirm(dto.getFinanceKey());
+        loanHomevisitInvestigateOrderDto.setFinRemarks(dto.getFinanceRemarks());
+        loanHomevisitInvestigateOrderService.saveOrUpdateDto(loanHomevisitInvestigateOrderDto);
+        return rb.success();
+    }
+
+    public ResultBean<LoanHomeVisitInvestigateInitOperVo> 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();
+    }
+
+    public ResultBean<LoanHomeVisitInvestigateInitTranVo> 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());
+        loanHomevisitInvestigateTransportDto.setDriverSalary(dto.getDriverWage());
+        loanHomevisitInvestigateTransportDto.setToll(dto.getRoadToll());
+        loanHomevisitInvestigateTransportDto.setExpectedRevenue(dto.getIncome());
+        loanHomevisitInvestigateTransportService.saveOrUpdateDto(loanHomevisitInvestigateTransportDto);
+        return rb.success();
+    }
+
+    public ResultBean<LoanHomeVisitInvestigateInitPropVo> 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();
+    }
+
+    public ResultBean<LoanHomeVisitInvestigateInitJFJZVo> getHomeVisitWitnessInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitJFJZVo loanHomeVisitInvestigateInitJFJZVo = new LoanHomeVisitInvestigateInitJFJZVo();
+        //定位信息
+        List<LoanHomevisitInvestigateFileDetailsVo> dwxxImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DWXX.getAttachType());
+        List<String> location = new ArrayList<>();
+        if (dwxxImages != null && dwxxImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo dwxxImage : dwxxImages) {
+                location.add(dwxxImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitJFJZVo.setLocation(location);
+        //房屋照片
+        List<LoanHomevisitInvestigateFileDetailsVo> fwzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FWZP.getAttachType());
+        List<String> house = new ArrayList<>();
+        if (fwzpImages != null && fwzpImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo fwzpImage : fwzpImages) {
+                house.add(fwzpImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitJFJZVo.setHouse(house);
+        //门口照片
+        List<LoanHomevisitInvestigateFileDetailsVo> mkzpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.MKZP.getAttachType());
+        List<String> doorway = new ArrayList<>();
+        if (mkzpImages != null && mkzpImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo mkzpImage : mkzpImages) {
+                doorway.add(mkzpImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitJFJZVo.setDoorway(doorway);
+        //客厅卧室照片
+        List<LoanHomevisitInvestigateFileDetailsVo> ktwszpImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.KTWSZP.getAttachType());
+        List<String> indoor = new ArrayList<>();
+        if (ktwszpImages != null && ktwszpImages.size() > 0){
+            for (LoanHomevisitInvestigateFileDetailsVo ktwszpImage : ktwszpImages) {
+                indoor.add(ktwszpImage.getFileUrl());
+            }
+        }
+        loanHomeVisitInvestigateInitJFJZVo.setIndoor(indoor);
+        //合影照等
+        List<LoanHomevisitInvestigateFileDetailsVo> hyzdImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.HYZD.getAttachType());
+        List<String> 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<LoanHomeVisitInvestigateInitZMWJVo> getHomeVisitProveFileInfo(String sid) {
+        //贷款人身份证
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRSFZ.getAttachType());
+        //贷款人户口本
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHKB.getAttachType());
+        //贷款人婚姻证明
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrhyzmImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRHYZM.getAttachType());
+        //贷款人驾驶本
+        List<LoanHomevisitInvestigateFileDetailsVo> dkrjsbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRJSB.getAttachType());
+        //贷款人银行流水
+        List<LoanHomevisitInvestigateFileDetailsVo> dkryhlsImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DKRYHLS.getAttachType());
+        //配偶身份证
+        List<LoanHomevisitInvestigateFileDetailsVo> posfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POSFZ.getAttachType());
+        //配偶户口本
+        List<LoanHomevisitInvestigateFileDetailsVo> pohkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.POHKB.getAttachType());
+        //担保人身份证
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrsfzImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRSFZ.getAttachType());
+        //担保人户口本
+        List<LoanHomevisitInvestigateFileDetailsVo> dbrhkbImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.DBRHKB.getAttachType());
+        return null;
+    }
+
+    public ResultBean saveHomeVisitProveFileInfo(LoanHomeVisitInvestigateInitZMWJDto dto) {
+        return null;
+    }
+
+    public ResultBean<LoanHomeVisitInvestigateInitZCLVo> getAssetCertificateInfo(String sid) {
+        //银行卡
+        List<LoanHomevisitInvestigateFileDetailsVo> yhkImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.YHK.getAttachType());
+        //房产
+        List<LoanHomevisitInvestigateFileDetailsVo> fcImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.FC.getAttachType());
+        //车辆
+        List<LoanHomevisitInvestigateFileDetailsVo> clImages = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(sid, LoanAttachTypeEnum.CL.getAttachType());
+        return null;
+    }
+
+    public ResultBean saveAssetCertificateInfo(LoanHomeVisitInvestigateInitZCLDto dto) {
+        return null;
+    }
 }

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<LoanHomevisitInvestigateFile> {
 
-	//@Update("update loan_homevisit_investigate_file set name=#{msg} where id=#{id}")
+    //@Update("update loan_homevisit_investigate_file set name=#{msg} where id=#{id}")
-	//IPage<LoanHomevisitInvestigateFileVo> voPage(IPage<LoanHomevisitInvestigateFile> page, @Param(Constants.WRAPPER) QueryWrapper<LoanHomevisitInvestigateFile> qw);
+    //IPage<LoanHomevisitInvestigateFileVo> voPage(IPage<LoanHomevisitInvestigateFile> page, @Param(Constants.WRAPPER) QueryWrapper<LoanHomevisitInvestigateFile> qw);
-	
-	IPage<LoanHomevisitInvestigateFileVo> selectPageVo(IPage<LoanHomevisitInvestigateFile> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitInvestigateFile> qw);
-	
-	List<LoanHomevisitInvestigateFileVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitInvestigateFile> qw);
-	
-	@Select("select * from loan_homevisit_investigate_file")
-	List<LoanHomevisitInvestigateFileVo> selectListVo();
 
-	@Select("select * from loan_homevisit_investigate_file where mainSid = #{sid} and attachType = #{attachType}")
+    IPage<LoanHomevisitInvestigateFileVo> selectPageVo(IPage<LoanHomevisitInvestigateFile> page, @Param(Constants.WRAPPER) Wrapper<LoanHomevisitInvestigateFile> qw);
-    List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(@Param("sid") String sid,@Param("attachType") String attachType);
+
+    List<LoanHomevisitInvestigateFileVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<LoanHomevisitInvestigateFile> qw);
+
+    @Select("select * from loan_homevisit_investigate_file")
+    List<LoanHomevisitInvestigateFileVo> selectListVo();
+
+    List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(@Param("sid") String sid, @Param("attachType") String attachType, @Param("path") String path);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatefile/LoanHomevisitInvestigateFileMapper.xml

@@ -1,13 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileVo">
+    <select id="selectPageVo"
-		SELECT * FROM loan_homevisit_investigate_file <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileVo">
-	</select>
+        SELECT * FROM loan_homevisit_investigate_file
-	
+        <where>
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileVo">
+            ${ew.sqlSegment}
-		SELECT * FROM loan_homevisit_investigate_file <where> ${ew.sqlSegment} </where>
+        </where>
-	</select>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileVo">
+        SELECT * FROM loan_homevisit_investigate_file
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selByMainSidAndTypeKey"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo">
+        select sid,
+               createByName,
+               concat(#{path}, fileUrl) as fileUrl,
+               attachType,
+               mainSid
+        from loan_homevisit_investigate_file
+        where mainSid = #{sid}
+          and attachType = #{attachType}
+    </select>
 </mapper>

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<Loan
 	}
 
 	public List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(String sid, String attachType) {
-		return baseMapper.selByMainSidAndTypeKey(sid,attachType);
+		return baseMapper.selByMainSidAndTypeKey(sid,attachType,fileUploadComponent.getUrlPrefix());
 	}
 }

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<Loa
 
 	@Select("select * from loan_homevisit_investigate_operations where mainSid = #{sid}")
     LoanHomevisitInvestigateOperationsDetailsVo selByMainSid(String sid);
+
+	LoanHomeVisitInvestigateInitOperVo getHomeVisitOperationInfo(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateoperations/LoanHomevisitInvestigateOperationsMapper.xml

@@ -1,13 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsVo">
+    <select id="selectPageVo"
-		SELECT * FROM loan_homevisit_investigate_operations <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsVo">
-	</select>
+        SELECT * FROM loan_homevisit_investigate_operations
-	
+        <where>
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsVo">
+            ${ew.sqlSegment}
-		SELECT * FROM loan_homevisit_investigate_operations <where> ${ew.sqlSegment} </where>
+        </where>
-	</select>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsVo">
+        SELECT * FROM loan_homevisit_investigate_operations
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="getHomeVisitOperationInfo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo">
+        SELECT sid,
+               industryYears      AS numYears,
+               driveProTypeKey    AS driveKey,
+               driveProTypeValue  AS driveType,
+               beforeOpeTypeKey   AS operationKey,
+               beforeOpeTypeValue AS operationType
+        FROM loan_homevisit_investigate_operations
+        WHERE mainSid = #{sid}
+    </select>
 </mapper>

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);
+	}
 }

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<LoanHome
 
 	@Select("select * from loan_homevisit_investigate_order where mainSid = #{sid}")
     LoanHomevisitInvestigateOrderDetailsVo selByMainSid(String sid);
+
+    LoanHomeVisitInvestigateInitOrderVo getHomeVisitOrderInfo(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderMapper.xml

@@ -1,13 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderVo">
+    <select id="selectPageVo"
-		SELECT * FROM loan_homevisit_investigate_order <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderVo">
-	</select>
+        SELECT * FROM loan_homevisit_investigate_order
-	
+        <where>
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderVo">
+            ${ew.sqlSegment}
-		SELECT * FROM loan_homevisit_investigate_order <where> ${ew.sqlSegment} </where>
+        </where>
-	</select>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderVo">
+        SELECT * FROM loan_homevisit_investigate_order
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="getHomeVisitOrderInfo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo">
+        SELECT lo.sid,
+               li.`saleOrderSid` AS orderSid, ,
+               lo.carConfirm     AS carInfoKey,
+               lo.carRemarks     AS carInfoRemarks,
+               lo.finConfirm     AS financeKey,
+               lo.finRemarks     AS financeRemarks,
+               lo.finDownPay,
+               lo.finDownPayRemarks
+        FROM loan_homevisit_investigate_order lo
+                     LEFT JOIN loan_homevisit_investigate li
+                ON lo.`mainSid` = li.`sid`
+        WHERE lo.mainSid = #{sid}
+    </select>
 </mapper>

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<Loa
 	public LoanHomevisitInvestigateOrderDetailsVo selByMainSid(String sid) {
 		return baseMapper.selByMainSid(sid);
 	}
+
+	public LoanHomeVisitInvestigateInitOrderVo getHomeVisitOrderInfo(String sid) {
+		return baseMapper.getHomeVisitOrderInfo(sid);
+	}
 }

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<LoanH
 	
 	@Select("select * from loan_homevisit_investigate_otherpeo")
 	List<LoanHomevisitInvestigateOtherpeoVo> selectListVo();
+
+    List<LoanHomeVisitInvestigateInitOtherPeoVo> selByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateotherpeo/LoanHomevisitInvestigateOtherpeoMapper.xml

@@ -1,13 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo">
+    <select id="selectPageVo"
-		SELECT * FROM loan_homevisit_investigate_otherpeo <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo">
-	</select>
+        SELECT * FROM loan_homevisit_investigate_otherpeo
-	
+        <where>
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo">
+            ${ew.sqlSegment}
-		SELECT * FROM loan_homevisit_investigate_otherpeo <where> ${ew.sqlSegment} </where>
+        </where>
-	</select>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo">
+        SELECT * FROM loan_homevisit_investigate_otherpeo
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selByMainSid"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo">
+        SELECT sid,
+               peoName        AS name,
+               peoType        AS personnelKey,
+               mobile,
+               idNumber       AS idCard,
+               peoDomAddress,
+               peoPreAddress  AS address,
+               workUnit       AS company,
+               peoCareerValue AS job
+        FROM loan_homevisit_investigate_otherpeo
+        WHERE mainSid = #{sid}
+    </select>
 </mapper>

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<LoanHomeVisitInvestigateInitOtherPeoVo> selByMainSid(String sid) {
+		return baseMapper.selByMainSid(sid);
+	}
 }

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<LoanH
 
 	@Select("select * from loan_homevisit_investigate_property where mainSid = #{sid}")
     LoanHomevisitInvestigatePropertyDetailsVo selByMainSid(String sid);
+
+    LoanHomeVisitInvestigateInitPropVo getHomeVisitAssetsInfo(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigateproperty/LoanHomevisitInvestigatePropertyMapper.xml

@@ -1,13 +1,38 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyVo">
+    <select id="selectPageVo"
-		SELECT * FROM loan_homevisit_investigate_property <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyVo">
-	</select>
+        SELECT * FROM loan_homevisit_investigate_property
-	
+        <where>
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyVo">
+            ${ew.sqlSegment}
-		SELECT * FROM loan_homevisit_investigate_property <where> ${ew.sqlSegment} </where>
+        </where>
-	</select>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyVo">
+        SELECT * FROM loan_homevisit_investigate_property
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="getHomeVisitAssetsInfo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo">
+        SELECT sid,
+               isRealEstate      AS houseCheck,
+               propertyType      AS houseState,
+               realLoanSituation AS houseLoanKey,
+               realRemarks       AS houseRemarks,
+               isCar             AS carCheck,
+               carType           AS carState,
+               carLoanSituation  AS carLoanKey,
+               carRemarks,
+               downPaySourceKey  AS downPayment,
+               otherSourceKey    AS otherIncome
+        FROM loan_homevisit_investigate_property
+        WHERE mainSid = #{sid}
+    </select>
 </mapper>

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);
+	}
 }

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<Loan
 
 	@Select("select * from loan_homevisit_investigate_transport where mainSid = #{sid}")
     LoanHomevisitInvestigateTransportDetailsVo selByMainSid(String sid);
+
+    LoanHomeVisitInvestigateInitTranVo getHomeVisitTransportInfo(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigatetransport/LoanHomevisitInvestigateTransportMapper.xml

@@ -1,13 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
+    <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportVo">
+    <select id="selectPageVo"
-		SELECT * FROM loan_homevisit_investigate_transport <where> ${ew.sqlSegment} </where>
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportVo">
-	</select>
+        SELECT * FROM loan_homevisit_investigate_transport
-	
+        <where>
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportVo">
+            ${ew.sqlSegment}
-		SELECT * FROM loan_homevisit_investigate_transport <where> ${ew.sqlSegment} </where>
+        </where>
-	</select>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportVo">
+        SELECT * FROM loan_homevisit_investigate_transport
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="getHomeVisitTransportInfo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateInitTranVo">
+        SELECT sid,
+               transportRoute,
+               transportTypeKey       AS transportKey,
+               transportTypeValue     AS transportType,
+               transportGoodsTrip     AS transportGoodsGoTo,
+               transportGoodsRetTrip  AS transportGoodsReturn,
+               roundTripMileage       AS mileage,
+               `load`                 AS deadWeight,
+               monthlyTrip            AS monthCount,
+               perTripYuan            AS countPrice,
+               fuelConsumptionPerTrip AS fuelConsumption,
+               driverSalary           AS driverWage,
+               toll                   AS roadToll,
+               maintenance,
+               expectedRevenue        AS income,
+               netIncome
+        FROM loan_homevisit_investigate_transport
+        WHERE mainSid = #{sid}
+    </select>
 </mapper>

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);
+	}
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java

@@ -2,8 +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.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
 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;
@@ -46,7 +45,7 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
     }
 
     @Override
-    public ResultBean save2(SolutionsDto dto) {
+    public ResultBean save2(SolutionssDto dto) {
         return loanSolutionsService.save2(dto);
     }
 
@@ -86,6 +85,16 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
         return loanSolutionsService.calculate(query);
     }
 
+    @Override
+    public ResultBean<SolutionssVo> selectDetails2(String busSid) {
+        return loanSolutionsService.selectDetails2(busSid);
+    }
+
+    @Override
+    public ResultBean<SolutionssVo> details2(SolutionssQuery query) {
+        return loanSolutionsService.details2(query);
+    }
+
   /*  @Override
     public ResultBean<PagerVo<LoanSolutionsVo>> listPage(@RequestBody PagerQuery<LoanSolutionsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

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.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
 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<LoanSolutionsMapper
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     private LoanFinPolicyService loanFinPolicyService;
+    @Autowired
+    private LoanFinOtherPolicyService loanFinOtherPolicyService;
 
     public ResultBean<SolutionsDetailsVo> selectDetails(String saleOrderSid) {
         ResultBean<SolutionsDetailsVo> rb = ResultBean.fireFail();
@@ -831,15 +837,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutions.setOtherPolicyState(1);
             String loanDownPay = dto.getLoanDownPay();
             loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
+            loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
         } else {
-            BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
+            /*BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
             String loanDownPay = dto.getLoanDownPay();
-            loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);*/
             loanSolutions.setOtherPolicyState(0);
         }
         baseMapper.insert(loanSolutions);
-        loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
+
-        loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
         /***********************应收明细************************************/
         LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
         BeanUtil.copyProperties(dto, loanSolutionsDetail, "sid");
@@ -1391,14 +1398,629 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         return rate;
     }
 
-    public ResultBean save2(SolutionsDto dto) {
+    public ResultBean save2(SolutionssDto dto) {
         SolutionDetailsDto solutionDetailsDto = new SolutionDetailsDto();
         BeanUtil.copyProperties(dto, solutionDetailsDto);
-        solutionDetailsDto.setBusSid(dto.getSaleOrderSid());
+        solutionDetailsDto.setBusSid(dto.getBusSid());
         ResultBean resultBean = saveDtoss(solutionDetailsDto);
         return resultBean;
     }
 
+    public ResultBean<SolutionssVo> selectDetails2(String busSid) {
+        ResultBean<SolutionssVo> 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<BusSalesOrdersVo> 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<SolutionListVo> formList = getFormList(solutionssVo);
+            solutionssVo.setFinanceForms(formList);
+        }
+        solutionssVo.setBusSid(busSid);
+        return rb.success().setData(solutionssVo);
+    }
+
+    public List<SolutionListVo> getFormList(SolutionssVo solutionssVo) {
+        List<SolutionListVo> 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<SolutionssVo> details2(SolutionssQuery query) {
+        ResultBean<SolutionssVo> rb = ResultBean.fireFail();
+        SolutionssVo solutionssVo = new SolutionssVo();
+        BeanUtil.copyProperties(query, solutionssVo);
+        if (query.isShowMore()) {
+            CalculateQuery calculateQuery = new CalculateQuery();
+            BeanUtil.copyProperties(query, calculateQuery);
+            ResultBean<CalculateVo> resultBean = calculate(calculateQuery);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            CalculateVo calculateVo = resultBean.getData();
+            BeanUtil.copyProperties(calculateVo, solutionssVo);
+        }
+        List<SolutionListVo> formList = getFormList(solutionssVo);
+        solutionssVo.setFinanceForms(formList);
+        return rb.success().setData(solutionssVo);
+    }
+
   /*  @Autowired
     private LoanSolutionsTopService loanSolutionsTopService;
     @Autowired

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitCustomerVo.java

@@ -0,0 +1,67 @@
+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<String> bankCardImages;
+    @ApiModelProperty("配偶姓名")
+    private String spouseName;
+    @ApiModelProperty("配偶身份证")
+    private String spouseIdCard;
+    @ApiModelProperty("配偶电话")
+    private String spouseMobile;
+    @ApiModelProperty("配偶职业")
+    private String spouseJob;
+    @ApiModelProperty("配偶户籍地址")
+    private String spouseDomAddress;
+    @ApiModelProperty("配偶现住址")
+    private String spousePreAddress;
+    @ApiModelProperty("其他人员")
+    private List<AppLoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel;
+    @ApiModelProperty("紧急联系人姓名")
+    private String emergencyContactName;
+    @ApiModelProperty("紧急联系人电话")
+    private String emergencyContactMobile;
+    @ApiModelProperty("紧急联系人类型value")
+    private String emergencyContactType;
+    @ApiModelProperty("紧急联系人类型key")
+    private String emergencyContactTypeKey;
+}

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<String> location;
+    @ApiModelProperty("房屋照片")
+    private List<String> house;
+    @ApiModelProperty("门口照片")
+    private List<String> doorway;
+    @ApiModelProperty("客厅卧室")
+    private List<String> indoor;
+    @ApiModelProperty("合影照等")
+    private List<String> groupPhoto;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> location;
+    @ApiModelProperty("房屋照片")
+    private List<String> house;
+    @ApiModelProperty("门口照片")
+    private List<String> doorway;
+    @ApiModelProperty("客厅卧室")
+    private List<String> indoor;
+    @ApiModelProperty("合影照等")
+    private List<String> groupPhoto;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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;
+}

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;
+}

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;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOrderVo.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;
+
+import java.util.List;
+
+@Data
+public class AppLoanHomeVisitInvestigateInitOrderVo 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;
+}

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;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherPeoVo.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 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 peoDomAddress;
+    @ApiModelProperty("现住址")
+    private String address;
+    @ApiModelProperty("公司")
+    private String company;
+    @ApiModelProperty("职业")
+    private String job;
+}

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;
+}

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;
+}

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;
+}

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;
+}

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<String> houseProperty;
+    @ApiModelProperty("车辆")
+    private List<String> carProperty;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> houseProperty;
+    @ApiModelProperty("车辆")
+    private List<String> carProperty;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> lenderIdCard;
+    @ApiModelProperty("贷款人户口本")
+    private List<String> lenderAccount;
+    @ApiModelProperty("贷款人婚姻证明")
+    private List<String> lenderMarriageCertificate;
+    @ApiModelProperty("贷款人驾驶本")
+    private List<String> lenderDriverBook;
+    @ApiModelProperty("贷款人银行流水")
+    private List<String> lenderBankStatement;
+    @ApiModelProperty("配偶身份证")
+    private List<String> spouseIdCard;
+    @ApiModelProperty("配偶户口本")
+    private List<String> spouseAccount;
+    @ApiModelProperty("担保人身份证")
+    private List<String> guarantorIdCard;
+    @ApiModelProperty("担保人户口本")
+    private List<String> guarantorAccount;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

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<String> lenderIdCard;
+    @ApiModelProperty("贷款人户口本")
+    private List<String> lenderAccount;
+    @ApiModelProperty("贷款人婚姻证明")
+    private List<String> lenderMarriageCertificate;
+    @ApiModelProperty("贷款人驾驶本")
+    private List<String> lenderDriverBook;
+    @ApiModelProperty("贷款人银行流水")
+    private List<String> lenderBankStatement;
+    @ApiModelProperty("配偶身份证")
+    private List<String> spouseIdCard;
+    @ApiModelProperty("配偶户口本")
+    private List<String> spouseAccount;
+    @ApiModelProperty("担保人身份证")
+    private List<String> guarantorIdCard;
+    @ApiModelProperty("担保人户口本")
+    private List<String> guarantorAccount;
+    @ApiModelProperty("家访考察表sid")
+    private String mainSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveCustomerDto.java

@@ -0,0 +1,70 @@
+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<String> bankCardImages = new ArrayList<>();
+    @ApiModelProperty("配偶姓名")
+    private String spouseName;
+    @ApiModelProperty("配偶身份证")
+    private String spouseIdCard;
+    @ApiModelProperty("配偶电话")
+    private String spouseMobile;
+    @ApiModelProperty("配偶职业")
+    private String spouseJob;
+    @ApiModelProperty("配偶户籍地址")
+    private String spouseDomAddress;
+    @ApiModelProperty("配偶现住址")
+    private String spousePreAddress;
+    @ApiModelProperty("其他人员")
+    private List<AppLoanHomeVisitInvestigateInitOtherPeoDto> 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;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java

@@ -43,4 +43,85 @@ public interface LoanHomeVisitInvestigateFeign {
     @GetMapping("/getHomeVisitDataInfo")
     @ResponseBody
     public ResultBean<AppLoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("初始化家访考察客户信息")
+    @GetMapping("/getHomeVisitCustomerInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitCustomerVo> getHomeVisitCustomerInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察客户信息")
+    @PostMapping("/saveHomeVisitCustomerInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitCustomerInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveCustomerDto dto);
+
+    @ApiOperation("初始化家访考察订单信息")
+    @GetMapping("/getHomeVisitOrderInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察订单信息")
+    @PostMapping("/saveHomeVisitOrderInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitOrderInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitOrderDto dto);
+
+    @ApiOperation("初始化家访考察运营经历")
+    @GetMapping("/getHomeVisitOperationInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitOperVo> getHomeVisitOperationInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察运营经历")
+    @PostMapping("/saveHomeVisitOperationInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitOperationInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitOperDto dto);
+
+    @ApiOperation("初始化家访考察运输信息")
+    @GetMapping("/getHomeVisitTransportInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitTranVo> getHomeVisitTransportInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察运输信息")
+    @PostMapping("/saveHomeVisitTransportInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitTransportInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitTranDto dto);
+
+    @ApiOperation("初始化家访考察资产情况")
+    @GetMapping("/getHomeVisitAssetsInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitPropVo> getHomeVisitAssetsInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察资产情况")
+    @PostMapping("/saveHomeVisitAssetsInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitAssetsInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitPropDto dto);
+
+    @ApiOperation("初始化家访考察家访见证")
+    @GetMapping("/getHomeVisitWitnessInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitJFJZVo> getHomeVisitWitnessInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察家访见证")
+    @PostMapping("/saveHomeVisitWitnessInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitWitnessInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitJFJZDto dto);
+
+    @ApiOperation("初始化家访考察证明文件")
+    @GetMapping("/getHomeVisitProveFileInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitZMWJVo> getHomeVisitProveFileInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察证明文件")
+    @PostMapping("/saveHomeVisitProveFileInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitProveFileInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitZMWJDto dto);
+
+    @ApiOperation("初始化家访考察资产类")
+    @GetMapping("/getAssetCertificateInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitZCLVo> getAssetCertificateInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存家访考察资产类")
+    @PostMapping("/saveAssetCertificateInfo")
+    @ResponseBody
+    public ResultBean saveAssetCertificateInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateInitZCLDto dto);
+
 }

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;
+}

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<OrderSolutionListVo> financeForms = new ArrayList<>();
+
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.risk.solutions;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionssDto.java

@@ -0,0 +1,165 @@
+package com.yxt.anrui.terminal.api.risk.solutions;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+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 AppSolutionssDto implements Dto {
+    private static final long serialVersionUID = 939727612021140148L;
+
+    @ApiModelProperty("关联sid")
+    @JsonProperty("saleOrderSid")
+    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("贴息抵车款")
+    @JsonProperty("factoryDiscountUseMoney")
+    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;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java

@@ -26,6 +26,11 @@ public interface SolutionsFeign {
     @ResponseBody
     ResultBean save(@RequestBody AppSolutionsDto dto);
 
+    @ApiOperation("保存金融方案")
+    @PostMapping("/save2")
+    @ResponseBody
+    ResultBean save2(@RequestBody AppSolutionssDto dto);
+
     @ApiOperation("初始化金融方案")
     @GetMapping("/selectDetailsVo")
     @ResponseBody
@@ -40,4 +45,16 @@ public interface SolutionsFeign {
     @GetMapping("/selectOtherList")
     @ResponseBody
     ResultBean<List<OtherPolicysVo>> 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<AppSolutionVo> selectDetailsVo2(@RequestParam("saleOrderSid") String busSid);
+
+    @ApiOperation("计算")
+    @PostMapping("/calc")
+    @ResponseBody
+    ResultBean<AppSolutionVo> detailsVo2(@RequestBody AppSolutionQuery query);
+
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java

@@ -57,4 +57,84 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
     public ResultBean<AppLoanHomeVisitInvestigateInitInformationStateVo> getHomeVisitDataInfo(String sid) {
         return loanHomeVisitInvestigateService.getHomeVisitDataInfo(sid);
     }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitCustomerVo> getHomeVisitCustomerInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitCustomerInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveHomeVisitCustomerInfo(AppLoanHomeVisitInvestigateSaveCustomerDto dto) {
+        return loanHomeVisitInvestigateService.saveHomeVisitCustomerInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitOrderInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveHomeVisitOrderInfo(AppLoanHomeVisitInvestigateInitOrderDto dto) {
+        return loanHomeVisitInvestigateService.saveHomeVisitOrderInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitOperVo> getHomeVisitOperationInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitOperationInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveHomeVisitOperationInfo(AppLoanHomeVisitInvestigateInitOperDto dto) {
+        return loanHomeVisitInvestigateService.saveHomeVisitOperationInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitTranVo> getHomeVisitTransportInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitTransportInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveHomeVisitTransportInfo(AppLoanHomeVisitInvestigateInitTranDto dto) {
+        return loanHomeVisitInvestigateService.saveHomeVisitTransportInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitPropVo> getHomeVisitAssetsInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitAssetsInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveHomeVisitAssetsInfo(AppLoanHomeVisitInvestigateInitPropDto dto) {
+        return loanHomeVisitInvestigateService.saveHomeVisitAssetsInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitJFJZVo> getHomeVisitWitnessInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitWitnessInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveHomeVisitWitnessInfo(AppLoanHomeVisitInvestigateInitJFJZDto dto) {
+        return loanHomeVisitInvestigateService.saveHomeVisitWitnessInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitZMWJVo> getHomeVisitProveFileInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitProveFileInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveHomeVisitProveFileInfo(AppLoanHomeVisitInvestigateInitZMWJDto dto) {
+        return loanHomeVisitInvestigateService.saveHomeVisitProveFileInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitZCLVo> getAssetCertificateInfo(String sid) {
+        return loanHomeVisitInvestigateService.getAssetCertificateInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveAssetCertificateInfo(AppLoanHomeVisitInvestigateInitZCLDto dto) {
+        return loanHomeVisitInvestigateService.saveAssetCertificateInfo(dto);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -28,6 +28,15 @@ 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;
+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.*;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
@@ -110,4 +119,132 @@ public class LoanHomeVisitInvestigateService {
         BeanUtil.copyProperties(data,appLoanHomeVisitInvestigateInitInformationStateVo);
         return rb.success().setData(appLoanHomeVisitInvestigateInitInformationStateVo);
     }
+
+    public ResultBean<AppLoanHomeVisitInvestigateInitCustomerVo> 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();
+    }
+
+    public ResultBean<AppLoanHomeVisitInvestigateInitOrderVo> 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);
+    }
+
+    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<AppLoanHomeVisitInvestigateInitOperVo> 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();
+    }
+
+    public ResultBean<AppLoanHomeVisitInvestigateInitTranVo> 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();
+    }
+
+    public ResultBean<AppLoanHomeVisitInvestigateInitPropVo> 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();
+    }
+
+    public ResultBean<AppLoanHomeVisitInvestigateInitJFJZVo> 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<AppLoanHomeVisitInvestigateInitZMWJVo> 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<AppLoanHomeVisitInvestigateInitZCLVo> 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();
+    }
 }

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<AppSolutionsDetailsVo> selectDetailsVo(String saleOrderSid) {
         return solutionsService.selectDetailsVo(saleOrderSid);
@@ -42,4 +47,14 @@ public class SolutionsRest implements SolutionsFeign {
     public ResultBean<List<OtherPolicysVo>> selectOtherList(String orgPath, String userSid, String sid, String name) {
         return solutionsService.selectOtherList(orgPath, userSid, sid, name);
     }
+
+    @Override
+    public ResultBean<AppSolutionVo> selectDetailsVo2(String busSid) {
+        return solutionsService.selectDetailsVo2(busSid);
+    }
+
+    @Override
+    public ResultBean<AppSolutionVo> detailsVo2(AppSolutionQuery query) {
+        return solutionsService.detailsVo2(query);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java

@@ -6,8 +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.*;
-import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
 import com.yxt.anrui.terminal.api.risk.solutions.*;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -96,4 +95,41 @@ public class SolutionsService {
         }
         return rb.success().setData(listNew);
     }
+
+    public ResultBean<AppSolutionVo> selectDetailsVo2(String busSid) {
+        ResultBean<AppSolutionVo> rb = ResultBean.fireFail();
+        AppSolutionVo appSolutionVo = new AppSolutionVo();
+        ResultBean<SolutionssVo> 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<AppSolutionVo> detailsVo2(AppSolutionQuery query) {
+        ResultBean<AppSolutionVo> rb = ResultBean.fireFail();
+        AppSolutionVo appSolutionVo = new AppSolutionVo();
+        SolutionssQuery solutionssQuery = new SolutionssQuery();
+        BeanUtil.copyProperties(query, solutionssQuery);
+        ResultBean<SolutionssVo> 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);
+    }
+
+    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();
+    }
 }