优化

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrder.java

@@ -50,19 +50,25 @@ import lombok.Data;
 public class LoanHomevisitInvestigateOrder extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("车辆信息确认key")
+    private String carConfirmKey;
 	@ApiModelProperty("车辆信息确认")
-    private String carConfirm; // 车辆信息确认
+    private String carConfirm;
 	@ApiModelProperty("车辆信息确认备注")
-    private String carRemarks; // 车辆信息确认备注
+    private String carRemarks;
+    @ApiModelProperty("金融方案信息确认key")
+    private String finConfirmKey;
 	@ApiModelProperty("金融方案信息确认")
-    private String finConfirm; // 金融方案信息确认
+    private String finConfirm;
 	@ApiModelProperty("金融方案信息确认备注")
-    private String finRemarks; // 金融方案信息确认备注
+    private String finRemarks;
+    @ApiModelProperty("金融首付比例key")
+    private String finDownPayKey;
 	@ApiModelProperty("金融首付比例")
-    private String finDownPay; // 金融首付比例
+    private String finDownPay;
 	@ApiModelProperty("金融首付比例备注")
-    private String finDownPayRemarks; // 金融首付比例备注
+    private String finDownPayRemarks;
 	@ApiModelProperty("家访考察表sid")
-    private String mainSid; // 家访考察表sid
+    private String mainSid;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDetailsVo.java

@@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("车辆信息确认key")
+    private String carConfirmKey;
     @ApiModelProperty("车辆信息确认")
-    private String carConfirm; // 车辆信息确认
+    private String carConfirm;
     @ApiModelProperty("车辆信息确认备注")
-    private String carRemarks; // 车辆信息确认备注
+    private String carRemarks;
+    @ApiModelProperty("金融方案信息确认key")
+    private String finConfirmKey;
     @ApiModelProperty("金融方案信息确认")
-    private String finConfirm; // 金融方案信息确认
+    private String finConfirm;
     @ApiModelProperty("金融方案信息确认备注")
-    private String finRemarks; // 金融方案信息确认备注
+    private String finRemarks;
+    @ApiModelProperty("金融首付比例key")
+    private String finDownPayKey;
     @ApiModelProperty("金融首付比例")
-    private String finDownPay; // 金融首付比例
+    private String finDownPay;
     @ApiModelProperty("金融首付比例备注")
-    private String finDownPayRemarks; // 金融首付比例备注
+    private String finDownPayRemarks;
     @ApiModelProperty("家访考察表sid")
-    private String mainSid; // 家访考察表sid
+    private String mainSid;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderDto.java

@@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("车辆信息确认key")
+    private String carConfirmKey;
     @ApiModelProperty("车辆信息确认")
-    private String carConfirm; // 车辆信息确认
+    private String carConfirm;
     @ApiModelProperty("车辆信息确认备注")
-    private String carRemarks; // 车辆信息确认备注
+    private String carRemarks;
+    @ApiModelProperty("金融方案信息确认key")
+    private String finConfirmKey;
     @ApiModelProperty("金融方案信息确认")
-    private String finConfirm; // 金融方案信息确认
+    private String finConfirm;
     @ApiModelProperty("金融方案信息确认备注")
-    private String finRemarks; // 金融方案信息确认备注
+    private String finRemarks;
+    @ApiModelProperty("金融首付比例key")
+    private String finDownPayKey;
     @ApiModelProperty("金融首付比例")
-    private String finDownPay; // 金融首付比例
+    private String finDownPay;
     @ApiModelProperty("金融首付比例备注")
-    private String finDownPayRemarks; // 金融首付比例备注
+    private String finDownPayRemarks;
     @ApiModelProperty("家访考察表sid")
-    private String mainSid; // 家访考察表sid
+    private String mainSid;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderQuery.java

@@ -49,19 +49,25 @@ import lombok.Data;
 @ApiModel(value = "家访考察-订单信息 查询条件", description = "家访考察-订单信息 查询条件")
 public class LoanHomevisitInvestigateOrderQuery implements Query {
 
+    @ApiModelProperty("车辆信息确认key")
+    private String carConfirmKey;
     @ApiModelProperty("车辆信息确认")
-    private String carConfirm; // 车辆信息确认
+    private String carConfirm;
     @ApiModelProperty("车辆信息确认备注")
-    private String carRemarks; // 车辆信息确认备注
+    private String carRemarks;
+    @ApiModelProperty("金融方案信息确认key")
+    private String finConfirmKey;
     @ApiModelProperty("金融方案信息确认")
-    private String finConfirm; // 金融方案信息确认
+    private String finConfirm;
     @ApiModelProperty("金融方案信息确认备注")
-    private String finRemarks; // 金融方案信息确认备注
+    private String finRemarks;
+    @ApiModelProperty("金融首付比例key")
+    private String finDownPayKey;
     @ApiModelProperty("金融首付比例")
-    private String finDownPay; // 金融首付比例
+    private String finDownPay;
     @ApiModelProperty("金融首付比例备注")
-    private String finDownPayRemarks; // 金融首付比例备注
+    private String finDownPayRemarks;
     @ApiModelProperty("家访考察表sid")
-    private String mainSid; // 家访考察表sid
+    private String mainSid;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigateorder/LoanHomevisitInvestigateOrderVo.java

@@ -51,19 +51,25 @@ public class LoanHomevisitInvestigateOrderVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("车辆信息确认key")
+    private String carConfirmKey;
     @ApiModelProperty("车辆信息确认")
-    private String carConfirm; // 车辆信息确认
+    private String carConfirm;
     @ApiModelProperty("车辆信息确认备注")
-    private String carRemarks; // 车辆信息确认备注
+    private String carRemarks;
+    @ApiModelProperty("金融方案信息确认key")
+    private String finConfirmKey;
     @ApiModelProperty("金融方案信息确认")
-    private String finConfirm; // 金融方案信息确认
+    private String finConfirm;
     @ApiModelProperty("金融方案信息确认备注")
-    private String finRemarks; // 金融方案信息确认备注
+    private String finRemarks;
+    @ApiModelProperty("金融首付比例key")
+    private String finDownPayKey;
     @ApiModelProperty("金融首付比例")
-    private String finDownPay; // 金融首付比例
+    private String finDownPay;
     @ApiModelProperty("金融首付比例备注")
-    private String finDownPayRemarks; // 金融首付比例备注
+    private String finDownPayRemarks;
     @ApiModelProperty("家访考察表sid")
-    private String mainSid; // 家访考察表sid
+    private String mainSid;
 
 }

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

@@ -22,13 +22,16 @@
     <select id="getHomeVisitOrderInfo"
             resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo">
         SELECT lo.sid,
-               li.`saleOrderSid` AS orderSid, ,
-               lo.carConfirm     AS carInfoKey,
+               li.`saleOrderSid`    AS orderSid,
+               lo.carConfirmKey     AS carInfoKey,
+               lo.carConfirm        AS carInfoType,
                lo.carRemarks        AS carInfoRemarks,
-               lo.finConfirm     AS financeKey,
+               lo.finConfirmKey     AS financeKey,
+               lo.finConfirm        AS financeType,
                lo.finRemarks        AS financeRemarks,
-               lo.finDownPay,
-               lo.finDownPayRemarks
+               lo.finDownPayKey     AS paymentRatiokey,
+               lo.finDownPay        AS paymentRatio,
+               lo.finDownPayRemarks AS paymentRemarks
         FROM loan_homevisit_investigate_order lo
                      LEFT JOIN loan_homevisit_investigate li
                 ON lo.`mainSid` = li.`sid`