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/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -103,7 +103,7 @@
                  left join bus_sales_order bo on bv.salesOrderSid = bo.sid
         left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
         where bo.contractNo = #{contractId}
-          and (bs.busState>=402)
+          and (bs.busState>=402 and bs.busState != 403)
           and bv.linkSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -160,7 +160,9 @@ import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
@@ -468,11 +470,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrderModelDetailsVo != null) {
             //查询现车车辆
             if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(entity.getType())) {
-                if(StringUtils.isNotBlank(entity.getNowCarUnknownVinNum()) && !"0".equals(entity.getNowCarUnknownVinNum())){
+                if (StringUtils.isNotBlank(entity.getNowCarUnknownVinNum()) && !"0".equals(entity.getNowCarUnknownVinNum())) {
                     List<String> vinList = new ArrayList<>();
-                    vinList.add("不确定车架号("+entity.getNowCarUnknownVinNum()+")");
+                    vinList.add("不确定车架号(" + entity.getNowCarUnknownVinNum() + ")");
                     busSalesOrderModelDetailsVo.setVinNo(vinList);
-                }else{
+                } else {
                     List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
                     //包含采购系统的车架号
                     List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
@@ -523,7 +525,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             String topMessage = "";
             BusSalesOrderMakeup busSalesOrderMakeup = busSalesOrderMakeupService.detailsss(sid);
-            if(busSalesOrderMakeup != null){
+            if (busSalesOrderMakeup != null) {
                 //颜色
                 if (StringUtils.isNotBlank(busSalesOrderMakeup.getColor())) {
                     topMessage = topMessage + busSalesOrderMakeup.getColor();
@@ -602,7 +604,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         if (StringUtils.isNotBlank(totalValue.toString()) && !"0".equals(totalValue.toString())) {
             if (busSalesOrderPriceDetailsVo != null) {
-                BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()),2, BigDecimal.ROUND_CEILING);
+                BigDecimal discountA = totalValue.divide(new BigDecimal(busSalesOrderPriceDetailsVo.getQuantity()), 2, BigDecimal.ROUND_CEILING);
                 bigDecimalSing = bigDecimalSing.add(discountA);
             }
         }
@@ -1934,7 +1936,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         IPage<BusSalesOrder> page = PagerUtil.queryToPage(pq);
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), "");
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
-            if (StringUtils.isBlank(record.getClosingDate())){
+            if (StringUtils.isBlank(record.getClosingDate())) {
                 record.setClosingDate("-");
             }
             /*************再次发起按钮显示****************/
@@ -3421,11 +3423,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //若前端传值的订单类型为0则为现车，为1采购订单，为2排产
             //数据库中1为现车，2为采购订单，3为排产
             if ("0".equals(modelInfo.getType())) {
-                if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())){
+                if (StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum()) && !"0".equals(busSalesOrder.getNowCarUnknownVinNum())) {
                     List<String> vinList = new ArrayList<>();
-                    vinList.add("不确定车架号("+busSalesOrder.getNowCarUnknownVinNum()+")");
+                    vinList.add("不确定车架号(" + busSalesOrder.getNowCarUnknownVinNum() + ")");
                     modelInfo.setVinList(vinList);
-                }else{
+                } else {
                     //查询车架号
                     List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
                     //包含采购系统的车架号
@@ -3781,7 +3783,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     private AppOrderDetailsVo selectSolutions(AppOrderDetailsVo appOrderDetailsVo, String sid) {
-        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
+       /* ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
         List<OrderSolutionVo> list = new ArrayList<>();
         if (solutionsDetailsVoResultBean.getData() != null) {
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@@ -4069,7 +4071,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));
@@ -4304,7 +4306,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 list.add(getValueSpanSize(nominalPriceValue.toString(), 2, 0, false));
             }
         }
-        appOrderDetailsVo.setFinanceForms(list);
+        appOrderDetailsVo.setFinanceForms(list);*/
+
+        ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails2(sid);
+        if (resultBean.getData() != null) {
+            List<SolutionListVo> financeForms = resultBean.getData().getFinanceForms();
+            if(!financeForms.isEmpty()){
+                List<OrderSolutionVo> voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OrderSolutionVo.class)).collect(Collectors.toList());
+                appOrderDetailsVo.setFinanceForms(voList);
+            }
+        }
         return appOrderDetailsVo;
     }
 
@@ -5031,10 +5042,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         commonContract.setCustomerType(appOrderDetailsVo.getCustomerType());
         commonContract.setCustomerTypeKey(appOrderDetailsVo.getCustomerKey());
 
-        if(StringUtils.isBlank(busSalesOrder.getContractNo())){
+        if (StringUtils.isBlank(busSalesOrder.getContractNo())) {
             commonContractFeign.saveContract(commonContract);
             baseMapper.updateContractNoBySid(commonContract.getContractNo(), sid);
-        }else{
+        } else {
             commonContract.setContractNo(busSalesOrder.getContractNo());
         }
         ResultBean<List<FinUncollectedReceivablesDetailed>> listResultBean = finUncollectedDetailedFeign.selectByContractNo(commonContract.getContractNo());
@@ -6624,7 +6635,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public ResultBean<AppOrderDetailsVo> getSaleOrderDetailsByContractNo(String contractNo) {
         ResultBean<AppOrderDetailsVo> rb = ResultBean.fireFail();
         BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo);
-        if(busSalesOrder == null){
+        if (busSalesOrder == null) {
             return rb.setMsg("该合同号的订单不存在");
         }
         ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(busSalesOrder.getSid());
@@ -7069,6 +7080,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-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue

@@ -143,7 +143,7 @@ export default {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
-          if (this.formobj.receiveFilesList > 0) {
+          if (this.formobj.receiveFilesList.length > 0) {
             for (var i = 0; i < this.formobj.receiveFilesList.length; i++) {
               this.params.receiveFilesList.push(this.formobj.receiveFilesList[i].url)
             }

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/finwaitinvoiceapply.js

@@ -158,8 +158,8 @@ export function saveGeren(data) {
   })
 }
 
-// 查看款、票情况详情
-export function deliveredFinSelect(data) {
+// 查看款、票情况详情--开票管理
+export function deliveredByFinSelect(data) {
   return request({
     url: '/fin/v1/finvehicleinvoice/deliveredFinSelect',
     method: 'get',
@@ -170,3 +170,15 @@ export function deliveredFinSelect(data) {
   })
 }
 
+// 查看款、票情况详情 -- 开票申请、欠款开票申请等
+export function deliveredFinSelect(data) {
+  return request({
+    url: '/buscenter/v1/busdeliveredapply/deliveredFinSelect',
+    method: 'get',
+    params: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@@ -580,7 +580,7 @@ export default {
           return u
         })
       })
-      this.balance = parseInt(this.balanceCopy) - parseInt(resNum)
+      this.balance = parseFloat(this.balanceCopy) - parseFloat(resNum)
     },
     getlist() {
       if (this.formobj.purchaseSystemName === '') {
@@ -590,7 +590,7 @@ export default {
       this.listQuery.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.listQuery.purchaseSystemSid = this.formobj.purchaseSystemSid
       listAll(this.listQuery).then((res) => {
-        if (res.code === '200') {
+        if (res.success) {
           this.overduereceivable_list = res.data
         }
       })

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/relation/coupon.vue

@@ -168,7 +168,7 @@
 </template>
 
 <script>
-import { deliveredFinSelect } from '@/api/anruifinmanagement/finwaitinvoiceapply'
+import { deliveredByFinSelect } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 
 export default {
   name: 'PaymentTicket',
@@ -211,7 +211,7 @@ export default {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
       })
-      deliveredFinSelect({ contractNo: contractId, vinSid: row.vinSid }).then((response) => {
+      deliveredByFinSelect({ contractNo: contractId, vinSid: row.vinSid }).then((response) => {
         if (response.success) {
           console.log(response.data)
           this.formobj = response.data

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -529,7 +529,7 @@ export default {
           return u
         })
       })
-      this.balance = parseInt(this.balanceCopy) - parseInt(resNum)
+      this.balance = parseFloat(this.balanceCopy) - parseFloat(resNum)
     },
     getlist() {
       if (this.formobj.purchaseSystemName === '') {

anrui-riskcenter-ui/src/api/customizedfinancialsolutions/customizedfinancialsolutions.js

@@ -68,5 +68,74 @@ export default {
       data: data,
       headers: { 'Content-Type': 'application/json' }
     })
+  },
+  // 金融方案计算
+  calculate: function(data) {
+    return request({
+      url: '/riskcenter/v1/loansolutions/calculate',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  submit: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanTemplate/submitTemplateApply',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanTemplate/complete',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanTemplate/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanTemplate/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/riskcenter/v1/LoanTemplate/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanTemplate/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/riskcenter/v1/LoanTemplate/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
   }
 }

anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue

@@ -0,0 +1,492 @@
+<template>
+  <div style="margin-top: 2px">
+    <div v-show="viewState == 1">
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div class="title titleOne">
+          <div>消贷金融方案</div>
+          <el-button type="primary" size="mini" class="btntopblueline" @click="financialComputing">金融计算</el-button>
+        </div>
+        <div>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="6">
+              <div class="span-sty">是否打包</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }}</span></el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <div class="span-sty">产品政策</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">融资项目</div>
+              <el-form-item>
+                <div class="addinputInfo">
+                  <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
+                  <span>配件{{ formobj.accessoriesAmount }} 元</span>
+                  <span>挂车{{ formobj.trailerAmount }} 元</span>
+                  <span>保险{{ formobj.premium }} 元</span>
+                  <span>购置税{{ formobj.purchaseTax }} 元</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <div class="span-sty">融资项目总额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">首付比例(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">首付金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">产品贷款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">产品期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">贷款保证金比例(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bondRatio }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">贷款保证金</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bondAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">厂家贴息</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">贴息用途</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">年利率(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">月还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanPayMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">利息总额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanInterest }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div v-show="formobj.factoryDiscountUseKey == '01'">
+                <div class="span-sty">贴息抵车款</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+          <div v-show="formobj.otherPolicyState">
+            <div class="title">其它融</div>
+            <el-row>
+              <el-col :span="12">
+                <div class="span-sty">其它融名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">贷款金额</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyAmount }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">期数</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyPeriod }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">年利率(%)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">月还金额</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyMonthlyRepay }}</span></el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <div class="span-sty">利息总额</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyInterest }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="title">方案汇总</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">融资首付</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanDownPay }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">实际首付比例(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayAmountsRatio }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">总贷款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanAmountTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.period }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6"></el-col>
+            <el-col :span="6">
+              <div class="span-sty">月还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.monthlyRepay }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">利息总额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.interest }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">预计首款还款日</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">应收明细</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">融资首付</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayAmounts }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">贷款保证金</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bondAmounts }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">保险保证金</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.depositPremium }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">落户保证金</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.depositSettle }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">服务费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.serviceAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">代收意外险</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyAccidentPremium }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">上牌费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.registerAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">运管费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.operationAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">补车价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehOtherPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">其它费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.otherAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">其它费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.otherAmountRemark }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">办理方式选择</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
+            <el-col :span="6">
+              <div class="span-sty">代收费用合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <div class="span-sty">代收首年保险费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <div class="span-sty">代收购置税</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">应收合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
+            <el-col :span="6">
+              <div class="span-sty">抵顶费用合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <div class="span-sty">抵顶首年保险费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <div class="span-sty">抵顶购置税</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">实收合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.realTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">车辆总价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehTotalPrice }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">名义(留购)价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.nominalPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item><span class="addinputInfo">注：结清时需缴纳此费用</span></el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <financialscheme v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
+  </div>
+</template>
+<script>
+import financialscheme from './financialscheme'
+
+export default {
+  name: '',
+  components: {
+    financialscheme
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      formobj: {
+        saleOrderSid: '',
+        type: '',
+        isPack: '',
+        policyName: '',
+        policySid: '',
+        mainVehicleAmount: '',
+        accessoriesAmount: '',
+        trailerAmount: '',
+        purchaseTax: '',
+        premium: '',
+        loanTotal: '',
+
+        accessoriesAmountCb: false,
+        trailerAmountCb: false,
+        purchaseTaxCb: false,
+        premiumCb: false,
+
+        downPayRatio: '',
+        downPayAmount: '',
+        loanAmount: '',
+        loanPeriod: '',
+        bondRatio: '',
+        bondAmount: '',
+        factoryDiscount: '',
+        factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
+        policyYearRatio: '',
+        loanPayMoney: '',
+        loanInterest: '',
+        discountCar: '',
+        otherPolicyState: false,
+
+        otherPolicyName: '',
+        otherPolicySid: '',
+        otherPolicyAmount: '',
+        otherPolicyPeriod: '',
+
+        otherPolicyMonthlyRepay: '',
+        otherPolicyInterest: '',
+        otherPolicyYearRatio: '',
+
+        loanDownPay: '',
+        downPayAmountsRatio: '',
+        loanAmountTotal: '',
+        period: '',
+        monthlyRepay: '',
+        interest: '',
+        returnTime: '',
+
+        downPayAmounts: '',
+        bondAmounts: '',
+        depositPremium: '',
+        depositSettle: '',
+        serviceAmount: '',
+        proxyAccidentPremium: '',
+        registerAmount: '',
+        operationAmount: '',
+        vehOtherPrice: '',
+        otherAmount: '',
+        otherAmountRemark: '',
+        dealWay: '',
+        dealWayKey: '',
+        proxyPremium: '',
+        proxyPurchasetax: '',
+        proxyTotal: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        receivableTotal: '',
+        realTotal: '',
+        vehTotalPrice: '',
+        nominalPrice: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(value) {
+      this.formobj = value
+    },
+    financialComputing() {
+      this.viewState = 2
+      this.$refs['divCount'].showAdd(this.formobj)
+    },
+    backData(value) {
+      this.viewState = 1
+      this.formobj = value
+    },
+    backParameters() {
+      this.$emit('backParameters', this.formobj)
+      this.formobj = {
+        saleOrderSid: '',
+        type: '',
+        isPack: '',
+        policyName: '',
+        policySid: '',
+        mainVehicleAmount: '',
+        accessoriesAmount: '',
+        trailerAmount: '',
+        purchaseTax: '',
+        premium: '',
+        loanTotal: '',
+
+        accessoriesAmountCb: false,
+        trailerAmountCb: false,
+        purchaseTaxCb: false,
+        premiumCb: false,
+
+        downPayRatio: '',
+        downPayAmount: '',
+        loanAmount: '',
+        loanPeriod: '',
+        bondRatio: '',
+        bondAmount: '',
+        factoryDiscount: '',
+        factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
+        policyYearRatio: '',
+        loanPayMoney: '',
+        loanInterest: '',
+        discountCar: '',
+        otherPolicyState: false,
+
+        otherPolicyName: '',
+        otherPolicySid: '',
+        otherPolicyAmount: '',
+        otherPolicyPeriod: '',
+
+        otherPolicyMonthlyRepay: '',
+        otherPolicyInterest: '',
+        otherPolicyYearRatio: '',
+
+        loanDownPay: '',
+        downPayAmountsRatio: '',
+        loanAmountTotal: '',
+        period: '',
+        monthlyRepay: '',
+        interest: '',
+        returnTime: '',
+
+        downPayAmounts: '',
+        bondAmounts: '',
+        depositPremium: '',
+        depositSettle: '',
+        serviceAmount: '',
+        proxyAccidentPremium: '',
+        registerAmount: '',
+        operationAmount: '',
+        vehOtherPrice: '',
+        otherAmount: '',
+        otherAmountRemark: '',
+        dealWay: '',
+        dealWayKey: '',
+        proxyPremium: '',
+        proxyPurchasetax: '',
+        proxyTotal: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        receivableTotal: '',
+        realTotal: '',
+        vehTotalPrice: '',
+        nominalPrice: ''
+      }
+    },
+    resetState() {
+      this.viewState = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.formaddcopy02 {
+  padding: 0px;
+}
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue

@@ -9,7 +9,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }}</span></el-form-item>
             </el-col>
             <el-col :span="18">
-              <div class="span-sty">资方及产品政策</div>
+              <div class="span-sty">产品政策</div>
               <el-form-item><span class="addinputInfo">{{ formobj.policyName }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -81,8 +81,10 @@
               <el-form-item><span class="addinputInfo">{{ formobj.loanInterest }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">贴息抵车款</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
+              <div v-show="formobj.factoryDiscountUseKey == '01'">
+                <div class="span-sty">贴息抵车款</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <div v-show="formobj.otherPolicyState">
@@ -102,6 +104,10 @@
               </el-col>
             </el-row>
             <el-row>
+              <el-col :span="6">
+                <div class="span-sty">年利率</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
+              </el-col>
               <el-col :span="6">
                 <div class="span-sty">月还金额</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyMonthlyRepay }}</span></el-form-item>
@@ -110,10 +116,6 @@
                 <div class="span-sty">利息总额</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyInterest }}</span></el-form-item>
               </el-col>
-              <el-col :span="6">
-                <div class="span-sty">年利率</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
-              </el-col>
             </el-row>
           </div>
           <div class="title">方案汇总</div>
@@ -136,11 +138,12 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6"></el-col>
             <el-col :span="6">
               <div class="span-sty">月还金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.monthlyRepay }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="6">
               <div class="span-sty">利息总额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.interest }}</span></el-form-item>
             </el-col>
@@ -201,10 +204,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="24">
               <div class="span-sty">办理方式选择</div>
               <el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
             </el-col>
+          </el-row>
+          <el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
+            <el-col :span="6">
+              <div class="span-sty">代收费用合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
+            </el-col>
             <el-col :span="9">
               <div class="span-sty">代收首年保险费</div>
               <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
@@ -220,7 +229,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
             <el-col :span="6">
               <div class="span-sty">抵顶费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>

anrui-riskcenter-ui/src/router/index.js

@@ -267,6 +267,29 @@ export const constantRoutes = [
     component: () =>
       import('@/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue'),
     name: 'CreditAuditAppealYiBan'
+  },
+
+
+  // 公司定制金融方案--编辑
+  {
+    path: '/dingzhijinrongFlow/customizedfinancialsolutionsEdit',
+    component: () =>
+      import('@/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue'),
+    name: 'CustomizedFinancialSolutionsEdit'
+  },
+  // 公司定制金融方案--待办
+  {
+    path: '/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan',
+    component: () =>
+      import('@/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue'),
+    name: 'CustomizedFinancialSolutionsDaiBan'
+  },
+  // 公司定制金融方案--已办
+  {
+    path: '/dingzhijinrongFlow/customizedfinancialsolutionsYiban',
+    component: () =>
+      import('@/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsYiban.vue'),
+    name: 'CustomizedFinancialSolutionsYiBan'
   }
 	// 404 page must be placed at the end !!!
 	// { path: '*', redirect: '/404', hidden: true }

anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutions.vue

@@ -8,7 +8,7 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="130px" class="tab-header">
               <el-form-item label="分公司">
                 <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
@@ -51,7 +51,7 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" width="180px" align="center">
+            <el-table-column label="操作" width="150" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
@@ -69,10 +69,10 @@
             <el-table-column prop="createByName" label="申请人" align="center" width="160" />
             <el-table-column prop="filingDate" label="申请日期" align="center" width="100" />
             <el-table-column prop="templateName" label="模板名称" align="center" width="100" />
-            <el-table-column prop="vehTypeValue" label="预估报价单方案" align="center" width="100" />
-            <el-table-column prop="serviceAmountTypeValue" label="车型" align="center" width="120" />
-            <el-table-column prop="policyName" label="资方产品政策" align="center" width="80" />
-            <el-table-column prop="otherPolicyName" label="其他融产品名称" align="center" width="100" />
+            <el-table-column prop="showTypeValue" label="预估报价单方案" align="center" width="130" />
+            <el-table-column prop="vehModel" label="车型" align="center" min-width="270" />
+            <el-table-column prop="policyName" label="资方产品政策" align="center" width="120" />
+            <el-table-column prop="otherPolicyName" label="其他融产品名称" align="center" width="120" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->

anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue

@@ -27,7 +27,7 @@
           </el-row>
           <div class="title titleOne">
             <div>车型确定</div>
-            <el-button type="primary" size="mini" @click="selectModel">选择车型</el-button>
+            <el-button type="primary" size="mini" class="btntopblueline" @click="selectModel">选择车型</el-button>
           </div>
           <el-row>
             <el-col :span="24">
@@ -62,7 +62,7 @@
           </el-row>
           <div class="title titleOne">
             <div><el-checkbox v-model="formobj.install" style="padding-right: 5px"/>上装</div>
-            <el-button v-show="formobj.install" type="primary" size="mini" @click="selectSZ">选择上装</el-button>
+            <el-button v-show="formobj.install" type="primary" size="mini" class="btntopblueline" @click="selectSZ">选择上装</el-button>
           </div>
           <div v-show="formobj.install">
             <el-row>
@@ -114,9 +114,9 @@
               </el-col>
             </el-row>
           </div>
-          <div class="title titleOne">
+          <div class="title titleOne" style="margin-top: 2px">
             <div><el-checkbox v-model="formobj.trailer" style="padding-right: 5px"/>挂车</div>
-            <el-button v-show="formobj.trailer" type="primary" size="mini" @click="selectGC">选择挂车</el-button>
+            <el-button v-show="formobj.trailer" type="primary" size="mini" class="btntopblueline" @click="selectGC">选择挂车</el-button>
           </div>
           <div v-show="formobj.trailer">
             <el-row>
@@ -172,10 +172,7 @@
               </el-col>
             </el-row>
           </div>
-          <div class="title">
-            <div>消贷金融方案<span style="margin-left: 10px">(说明：融资项目中保险为预估费用，必须小于保险发票票面金额，预估金额精确到百位。购置税=主车发票价/11.3，舍到个位，不足金额需要客户线下补交。)</span></div>
-          </div>
-          <financialscheme ref="divJRFA" :params="this.formobj.loanTemplateSolutions" @backData="backData"/>
+          <financialschemeEdit ref="divJRFA" @backParameters="backData"/>
         </el-form>
       </div>
     </div>
@@ -194,7 +191,7 @@ import { typeValues, getOrgSidByPath, getAnnounceList } from '@/api/Common/dictc
 import shangzhuangselect from './relation/shangzhuangselect'
 import modelSelect from './relation/modelSelect'
 import guacheselect from './relation/guacheselect'
-import financialscheme from '@/components/publicPage/financialscheme'
+import financialschemeEdit from '@/components/publicPage/financialschemeEdit'
 import uploadImg from '@/components/uploadFile/uploadImg'
 
 export default {
@@ -203,7 +200,7 @@ export default {
     modelSelect,
     shangzhuangselect,
     guacheselect,
-    financialscheme,
+    financialschemeEdit,
     uploadImg
   },
   data() {
@@ -261,6 +258,7 @@ export default {
           bondAmount: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
+          factoryDiscountUseKey: '',
           policyYearRatio: '',
           loanPayMoney: '',
           loanInterest: '',
@@ -373,80 +371,10 @@ export default {
       })
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-      this.formobj.loanTemplateSolutions = {
-        saleOrderSid: '',
-        type: '',
-        isPack: '',
-        policyName: '',
-        policySid: '',
-        mainVehicleAmount: '',
-        accessoriesAmount: '',
-        trailerAmount: '',
-        purchaseTax: '',
-        premium: '',
-        loanTotal: '',
-
-        accessoriesAmountCb: false,
-        trailerAmountCb: false,
-        purchaseTaxCb: false,
-        premiumCb: false,
-
-        downPayRatio: '',
-        downPayAmount: '',
-        loanAmount: '',
-        loanPeriod: '',
-        bondRatio: '',
-        bondAmount: '',
-        factoryDiscount: '',
-        factoryDiscountUse: '',
-        factoryDiscountUseKey: '',
-        policyYearRatio: '',
-        loanPayMoney: '',
-        loanInterest: '',
-        otherPolicyState: false,
-
-        otherPolicyName: '',
-        otherPolicySid: '',
-        otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
-        otherPolicyInterest: '',
-        otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
-        period: '',
-        monthlyRepay: '',
-        interest: '',
-        returnTime: '',
-
-        downPayAmounts: '',
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
-        proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
-        proxyPremium: '',
-        proxyPurchasetax: '',
-        offsetPremium: '',
-        offsetPurchasetax: '',
-        offsetTotal: '',
-        receivableTotal: '',
-        realTotal: '',
-        vehTotalPrice: '',
-        nominalPrice: ''
-      }
+      this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions)
     },
     showEdit(row) {
+      this.init()
       this.viewTitle = '【编辑】公司定制金融方案申请'
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
@@ -454,6 +382,16 @@ export default {
       req.fetchBySid({ sid: row.sid }).then((res) => {
         if (res.success) {
           this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+          this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions)
+          if (this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.length > 0) {
+            this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.forEach((e) => {
+              this.image_list.push({
+                name: '',
+                url: e
+              })
+            })
+          }
         }
       })
     },
@@ -549,7 +487,7 @@ export default {
     saveOrUpdate() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
-          this.$refs['divJRFA'].backData()
+          this.$refs['divJRFA'].backParameters()
           this.getUrl()
           this.submitdisabled = true
           console.log(this.formobj)
@@ -568,7 +506,21 @@ export default {
     },
     submit() {
       this.$refs['form_obj'].validate((valid) => {
-        if (valid) {}
+        if (valid) {
+          this.$refs['divJRFA'].backParameters()
+          this.getUrl()
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
       })
     },
     resetState() {

anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsInfo.vue

@@ -49,10 +49,10 @@
               <el-form-item><span class="addinputInfo">{{ formobj.vehNoticeModel }}</span></el-form-item>
             </el-col>
           </el-row>
-          <div class="title titleOne">
-            <div><el-checkbox v-model="formobj.install" style="padding-right: 5px"/>上装</div>
-          </div>
           <div v-show="formobj.install">
+            <div class="title titleOne">
+              <div>上装</div>
+            </div>
             <el-row>
               <el-col :span="6">
                 <div class="span-sty">上装名称</div>
@@ -102,10 +102,10 @@
               </el-col>
             </el-row>
           </div>
-          <div class="title titleOne">
-            <div><el-checkbox v-model="formobj.trailer" style="padding-right: 5px"/>挂车</div>
-          </div>
           <div v-show="formobj.trailer">
+            <div class="title titleOne">
+              <div>挂车</div>
+            </div>
             <el-row>
               <el-col :span="12">
                 <div class="span-sty">车型名称</div>
@@ -174,7 +174,7 @@ import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions
 import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
 
 export default {
-  name: '',
+  name: 'CustomizedFinancialSolutionsInfo',
   components: {
     financialschemeInfo
   },
@@ -371,6 +371,7 @@ export default {
           bondAmount: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
+          factoryDiscountUseKey: '',
           policyYearRatio: '',
           loanPayMoney: '',
           loanInterest: '',

anrui-riskcenter-ui/src/views/customizedfinancialsolutions/relation/modelSelect.vue

@@ -25,18 +25,18 @@
         </div>
         <div class="">
           <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%">
-            <el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column width="60" fixed label="编号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="操作" fixed width="80" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" @click="handleConfirm(scope.row)">确认</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="品牌" align="center" width="250">
+            <el-table-column label="品牌" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.brandName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="车型编码" align="center" width="120">
+            <el-table-column label="车型编码" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.vehicleTypeCode }}</span>
               </template>
@@ -46,7 +46,7 @@
                 <span>{{ scope.row.vehicleAlias }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="配置编码" align="center" width="120">
+            <el-table-column label="配置编码" align="center" width="100">
               <template slot-scope="scope">
                 <span>{{ scope.row.configCode }}</span>
               </template>
@@ -56,12 +56,12 @@
                 <span>{{ scope.row.configName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="内部编码" align="center">
+            <el-table-column label="内部编码" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="销售指导价(元)" width="200" align="center">
+            <el-table-column label="销售指导价(元)" width="130" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.guidedPrice }}</span>
               </template>

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue

@@ -0,0 +1,555 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="12">
+              <div class="span-sty">模板名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.templateName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">选择预估报价单</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.showTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>车型确定</div>
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item><span>{{ formobj.vehModel }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24" class="tlineheightb">
+              <div class="span-sty">常用配置</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehModelConfig }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24" class="tlineheightb">
+              <div class="span-sty">更多配置</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehModelConfigMore }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">单台指导价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">合格证公告型号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehNoticeModel }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-show="formobj.install">
+            <div class="title titleOne">
+              <div>上装</div>
+            </div>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">上装名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.installNameValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">委改方式</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.refitMethodValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">供应商</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.refitFactory }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">货箱内部尺寸</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.wkSize }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">板材材质</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.plateMaterialValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">板材厚度</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.plateThickness }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">颜色</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.colorValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">融资价格</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.vehInstallPrice }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24" class="tlineheightb">
+                <div class="span-sty">更多配置</div>
+                <el-form-item><span>{{ formobj.loanTemplateInstall.moreConfig }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">备注说明</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.vehInstallRemark }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div v-show="formobj.trailer">
+            <div class="title titleOne">
+              <div>挂车</div>
+            </div>
+            <el-row>
+              <el-col :span="12">
+                <div class="span-sty">车型名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.modelTrailerName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">车辆品牌</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.brandName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">车辆型号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.carModelName }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">厂商名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.manufacturerName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">内部尺寸</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.insideSize }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">箱体颜色</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.boxColor }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">融资价格</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.vehTrailerPrice }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">更多配置</div>
+                <el-form-item><span>{{ formobj.loanTemplateTrailer.moreConfig }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">同车型合格证上传</div>
+                <el-form-item>
+                  <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.loanTemplateTrailer.vehTrailerCertificateFile" :key="index" :src="item" :preview-src-list="formobj.loanTemplateTrailer.vehTrailerCertificateFile"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">备注说明</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.vehTrailerRemark }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="title">
+            <div>消贷金融方案</div>
+          </div>
+          <financialschemeInfo ref="divInfo"/>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
+import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
+
+export default {
+  name: 'CustomizedFinancialSolutionsDaiBan',
+  components: {
+    financialschemeInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      formobj: {
+        useOrgSid: '',
+        install: false,
+        loanTemplateInstall: {
+          colorValue: '',
+          installNameValue: '',
+          moreConfig: '',
+          plateMaterialValue: '',
+          plateThicknessBottom: '',
+          plateThicknessEdge: '',
+          plateThickness: '',
+          refitFactory: '',
+          refitMethodValue: '',
+          vehInstallPrice: '',
+          vehInstallRemark: '',
+          vehInstallModelSid: '',
+          wkSize: '',
+          wk_high: '',
+          wk_long: '',
+          wk_wide: ''
+        },
+        loanTemplateSolutions: {
+          saleOrderSid: '',
+          type: '',
+          isPack: '',
+          policyName: '',
+          policySid: '',
+          mainVehicleAmount: '',
+          accessoriesAmount: '',
+          trailerAmount: '',
+          purchaseTax: '',
+          premium: '',
+          loanTotal: '',
+
+          accessoriesAmountCb: false,
+          trailerAmountCb: false,
+          purchaseTaxCb: false,
+          premiumCb: false,
+
+          downPayRatio: '',
+          downPayAmount: '',
+          loanAmount: '',
+          loanPeriod: '',
+          bondRatio: '',
+          bondAmount: '',
+          factoryDiscount: '',
+          factoryDiscountUse: '',
+          policyYearRatio: '',
+          loanPayMoney: '',
+          loanInterest: '',
+          discountCar: '',
+          otherPolicyState: false,
+
+          otherPolicyName: '',
+          otherPolicySid: '',
+          otherPolicyAmount: '',
+          otherPolicyPeriod: '',
+
+          otherPolicyMonthlyRepay: '',
+          otherPolicyInterest: '',
+          otherPolicyYearRatio: '',
+
+          loanDownPay: '',
+          downPayAmountsRatio: '',
+          loanAmountTotal: '',
+          period: '',
+          monthlyRepay: '',
+          interest: '',
+          returnTime: '',
+
+          downPayAmounts: '',
+          bondAmounts: '',
+          depositPremium: '',
+          depositSettle: '',
+          serviceAmount: '',
+          proxyAccidentPremium: '',
+          registerAmount: '',
+          operationAmount: '',
+          vehOtherPrice: '',
+          otherAmount: '',
+          otherAmountRemark: '',
+          dealWay: '',
+          dealWayKey: '',
+          proxyPremium: '',
+          proxyPurchasetax: '',
+          proxyTotal: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          receivableTotal: '',
+          realTotal: '',
+          vehTotalPrice: '',
+          nominalPrice: ''
+        },
+        loanTemplateTrailer: {
+          boxColor: '',
+          brandName: '',
+          carModelName: '',
+          insideSize: '',
+          insideSizeHigh: '',
+          insideSizeLong: '',
+          insideSizeWide: '',
+          manufacturerName: '',
+          modelTrailerName: '',
+          moreConfig: '',
+          vehTrailerModelSid: '',
+          vehTrailerCertificateFile: [],
+          vehTrailerPrice: '',
+          vehTrailerRemark: ''
+        },
+        orgPath: '',
+        showTypeKey: '',
+        showTypeValue: '',
+        sid: '',
+        taskId: '',
+        templateName: '',
+        trailer: false,
+        instanceId: '',
+        userSid: '',
+        vehModel: '',
+        vehModelConfig: '',
+        vehModelConfigMore: '',
+        vehModelConfigSid: '',
+        vehModelSid: '',
+        vehNoticeModel: '',
+        vehNoticeModelSid: '',
+        vehPrice: ''
+      },
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '公司定制金融方案详情'
+      req.fetchBySid({ sid: sid }).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          this.$nextTick(() => {
+            this.$refs['divInfo'].showInfo(this.formobj.loanTemplateSolutions)
+          })
+        }
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      }
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 140px !important;
+}
+.addinputInfo {
+  margin-left: 130px !important;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue

@@ -0,0 +1,586 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="12">
+              <div class="span-sty">模板名称</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 30%" v-model="formobj.templateName" clearable placeholder=""/></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">选择预估报价单</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.showTypeKey" placeholder="请选择" @change="showTypeChange" clearable filterable>
+                  <el-option v-for="item in proposal_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>车型确定</div>
+            <el-button type="primary" size="mini" @click="selectModel">选择车型</el-button>
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item><span>{{ formobj.vehModel }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24" class="tlineheightb">
+              <div class="span-sty">常用配置</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehModelConfig }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24" class="tlineheightb">
+              <div class="span-sty">更多配置</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehModelConfigMore }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">单台指导价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">合格证公告型号</div>
+              <el-form-item>
+                <el-select class="addinputInfo" v-model="formobj.vehNoticeModelSid" placeholder="请选择" @change="noticeModelChange" clearable filterable>
+                  <el-option v-for="item in NoticeModel_list" :key="item.sid" :label="item.dictValue" :value="item.sid"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div><el-checkbox v-model="formobj.install" style="padding-right: 5px"/>上装</div>
+            <el-button v-show="formobj.install" type="primary" size="mini" @click="selectSZ">选择上装</el-button>
+          </div>
+          <div v-show="formobj.install">
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">上装名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.installNameValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">委改方式</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.refitMethodValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">供应商</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.refitFactory }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">货箱内部尺寸</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.wkSize }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">板材材质</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.plateMaterialValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">板材厚度</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.plateThickness }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">颜色</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.colorValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">融资价格</div>
+                <el-form-item><el-input v-model="formobj.loanTemplateInstall.vehInstallPrice" class="addinputInfo" style="width: 50%" clearable placeholder=""/></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24" class="tlineheightb">
+                <div class="span-sty">更多配置</div>
+                <el-form-item><span>{{ formobj.loanTemplateInstall.moreConfig }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">备注说明</div>
+                <el-form-item><el-input v-model="formobj.loanTemplateInstall.vehInstallRemark" class="addinputw addinputInfo" clearable placeholder=""/></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="title titleOne" style="margin-top: 2px">
+            <div><el-checkbox v-model="formobj.trailer" style="padding-right: 5px"/>挂车</div>
+            <el-button v-show="formobj.trailer" type="primary" size="mini" @click="selectGC">选择挂车</el-button>
+          </div>
+          <div v-show="formobj.trailer">
+            <el-row>
+              <el-col :span="12" class="tlineheightb">
+                <div class="span-sty">车型名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.modelTrailerName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">车辆品牌</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.brandName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">车辆型号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.carModelName }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">厂商名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.manufacturerName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">内部尺寸</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.insideSize }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">箱体颜色</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.boxColor }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">融资价格</div>
+                <el-form-item><el-input v-model="formobj.loanTemplateTrailer.vehTrailerPrice" class="addinputInfo" style="width: 50%" clearable placeholder=""/></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">更多配置</div>
+                <el-form-item><span>{{ formobj.loanTemplateTrailer.moreConfig }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">同车型合格证上传</div>
+                <el-form-item>
+                  <upload-img ref="uploadImg" class="addinputInfo" v-model="image_list" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">备注说明</div>
+                <el-form-item><el-input v-model="formobj.loanTemplateTrailer.vehTrailerRemark" class="addinputw addinputInfo" clearable placeholder=""/></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <financialschemeEdit ref="divJRFA" @backParameters="backData"/>
+        </el-form>
+      </div>
+    </div>
+    <!-- 车型选择 -->
+    <modelSelect v-show="viewState == 2" ref="divModel" @backData="backModel" @doback="resetState"/>
+    <!-- 上装选择 -->
+    <shangzhuangselect v-show="viewState == 3" ref="divSZ" @backData="backSZ" @doback="resetState"/>
+    <!-- 挂车选择 -->
+    <guacheselect v-show="viewState == 4" ref="divGC" @backData="backGC" @doback="resetState"/>
+  </div>
+</template>
+
+<script>
+import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
+import { typeValues, getAnnounceList } from '@/api/Common/dictcommons'
+import shangzhuangselect from './relation/shangzhuangselect'
+import modelSelect from './relation/modelSelect'
+import guacheselect from './relation/guacheselect'
+import financialschemeEdit from '@/components/publicPage/financialschemeEdit'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'CustomizedFinancialSolutionsEdit',
+  components: {
+    modelSelect,
+    shangzhuangselect,
+    guacheselect,
+    financialschemeEdit,
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      proposal_list: [],
+      NoticeModel_list: [],
+      image_list: [],
+      formobj: {
+        useOrgSid: '',
+        install: false,
+        loanTemplateInstall: {
+          colorValue: '',
+          installNameValue: '',
+          moreConfig: '',
+          plateMaterialValue: '',
+          plateThicknessBottom: '',
+          plateThicknessEdge: '',
+          plateThickness: '',
+          refitFactory: '',
+          refitMethodValue: '',
+          vehInstallPrice: '',
+          vehInstallRemark: '',
+          vehInstallModelSid: '',
+          wkSize: '',
+          wk_high: '',
+          wk_long: '',
+          wk_wide: ''
+        },
+        loanTemplateSolutions: {
+          saleOrderSid: '',
+          type: '',
+          isPack: '',
+          policyName: '',
+          policySid: '',
+          mainVehicleAmount: '',
+          accessoriesAmount: '',
+          trailerAmount: '',
+          purchaseTax: '',
+          premium: '',
+          loanTotal: '',
+
+          accessoriesAmountCb: false,
+          trailerAmountCb: false,
+          purchaseTaxCb: false,
+          premiumCb: false,
+
+          downPayRatio: '',
+          downPayAmount: '',
+          loanAmount: '',
+          loanPeriod: '',
+          bondRatio: '',
+          bondAmount: '',
+          factoryDiscount: '',
+          factoryDiscountUse: '',
+          factoryDiscountUseKey: '',
+          policyYearRatio: '',
+          loanPayMoney: '',
+          loanInterest: '',
+          discountCar: '',
+          otherPolicyState: false,
+
+          otherPolicyName: '',
+          otherPolicySid: '',
+          otherPolicyAmount: '',
+          otherPolicyPeriod: '',
+
+          otherPolicyMonthlyRepay: '',
+          otherPolicyInterest: '',
+          otherPolicyYearRatio: '',
+
+          loanDownPay: '',
+          downPayAmountsRatio: '',
+          loanAmountTotal: '',
+          period: '',
+          monthlyRepay: '',
+          interest: '',
+          returnTime: '',
+
+          downPayAmounts: '',
+          bondAmounts: '',
+          depositPremium: '',
+          depositSettle: '',
+          serviceAmount: '',
+          proxyAccidentPremium: '',
+          registerAmount: '',
+          operationAmount: '',
+          vehOtherPrice: '',
+          otherAmount: '',
+          otherAmountRemark: '',
+          dealWay: '',
+          dealWayKey: '',
+          proxyPremium: '',
+          proxyPurchasetax: '',
+          proxyTotal: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          receivableTotal: '',
+          realTotal: '',
+          vehTotalPrice: '',
+          nominalPrice: ''
+        },
+        loanTemplateTrailer: {
+          boxColor: '',
+          brandName: '',
+          carModelName: '',
+          insideSize: '',
+          insideSizeHigh: '',
+          insideSizeLong: '',
+          insideSizeWide: '',
+          manufacturerName: '',
+          modelTrailerName: '',
+          moreConfig: '',
+          vehTrailerModelSid: '',
+          vehTrailerCertificateFile: [],
+          vehTrailerPrice: '',
+          vehTrailerRemark: ''
+        },
+        orgPath: '',
+        showTypeKey: '',
+        showTypeValue: '',
+        sid: '',
+        taskId: '',
+        templateName: '',
+        trailer: false,
+        instanceId: '',
+        userSid: '',
+        vehModel: '',
+        vehModelConfig: '',
+        vehModelConfigMore: '',
+        vehModelConfigSid: '',
+        vehModelSid: '',
+        vehNoticeModel: '',
+        vehNoticeModelSid: '',
+        vehPrice: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'revalencyScheme' }).then((resp) => {
+        if (resp.success) {
+          this.proposal_list = resp.data
+        }
+      })
+    },
+    getAnnounceList() {
+      getAnnounceList({ modelSid: this.formobj.vehModelSid, orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.NoticeModel_list = []
+        }
+      })
+    },
+    showInfo(sid) {
+      this.init()
+      this.viewTitle = '【编辑】公司定制金融方案申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchBySid({ sid: sid }).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+          this.$refs['divJRFA'].showInfo(this.formobj.loanTemplateSolutions)
+          if (this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.length > 0) {
+            this.formobj.loanTemplateTrailer.vehTrailerCertificateFile.forEach((e) => {
+              this.image_list.push({
+                name: '',
+                url: e
+              })
+            })
+          }
+        }
+      })
+    },
+    showTypeChange(value) {
+      const choose = this.proposal_list.filter((item) => item.dictKey === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.showTypeValue = choose[0].dictValue
+      } else {
+        this.formobj.showTypeValue = ''
+      }
+    },
+    noticeModelChange(value) {
+      const choose = this.NoticeModel_list.filter((item) => item.sid === value)
+      if (choose.length > 0 && choose !== null) {
+        this.formobj.vehNoticeModel = choose[0].dictValue
+      } else {
+        this.formobj.vehNoticeModel = ''
+      }
+    },
+    selectModel() {
+      this.viewState = 2
+      const aa = []
+      if (this.formobj.vehModelConfigSid !== '' && this.formobj.vehModelSid !== '') {
+        aa.push({
+          vehicleSid: this.formobj.vehModelSid,
+          configSid: this.formobj.vehModelConfigSid
+        })
+      }
+      this.$refs['divModel'].showData(aa, '', this.formobj.useOrgSid)
+    },
+    backModel(value) {
+      this.viewState = 1
+      this.formobj.vehModel = value.modelName
+      this.formobj.vehModelSid = value.modelSid
+      this.formobj.vehModelConfig = value.configName
+      this.formobj.vehModelConfigSid = value.configSid
+      this.formobj.vehModelConfigMore = value.otherConfig
+      this.formobj.vehPrice = value.guidedPrice
+      this.getAnnounceList()
+    },
+    selectSZ() {
+      this.viewState = 3
+      this.$refs['divSZ'].showData()
+    },
+    backSZ(value) {
+      this.viewState = 1
+      this.formobj.loanTemplateInstall = {
+        colorValue: value.colorValue,
+        installNameValue: value.installNameValue,
+        moreConfig: value.moreConfig,
+        plateMaterialValue: value.plateMaterialValue,
+        plateThicknessBottom: '',
+        plateThicknessEdge: '',
+        plateThickness: value.plateThickness,
+        refitFactory: value.refitFactory,
+        refitMethodValue: value.refitMethodValue,
+        vehInstallPrice: '',
+        vehInstallRemark: '',
+        vehInstallModelSid: value.sid,
+        wkSize: value.wk,
+        wk_high: '',
+        wk_long: '',
+        wk_wide: ''
+      }
+    },
+    selectGC() {
+      this.viewState = 4
+      this.$refs['divGC'].showData()
+    },
+    backGC(value) {
+      this.viewState = 1
+      this.formobj.loanTemplateTrailer = {
+        boxColor: value.boxColor,
+        brandName: value.brandName,
+        carModelName: value.carModelName,
+        insideSize: value.appearanceSize,
+        insideSizeHigh: '',
+        insideSizeLong: '',
+        insideSizeWide: '',
+        manufacturerName: value.manufacturerName,
+        modelTrailerName: value.trailerTypeValue + '(' + value.appearanceSize + ')',
+        moreConfig: value.moreConfig,
+        vehTrailerModelSid: value.sid,
+        vehTrailerCertificateFile: [],
+        vehTrailerPrice: '',
+        vehTrailerRemark: ''
+      }
+    },
+    // 金融方案返回的参数
+    backData(value) {
+      this.formobj.loanTemplateSolutions = value
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.$refs['divJRFA'].backParameters()
+          this.getUrl()
+          this.submitdisabled = true
+          console.log(this.formobj)
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.$refs['divJRFA'].backParameters()
+          this.getUrl()
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '操作成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    getUrl() {
+      if (this.image_list.length > 0) {
+        const aa = []
+        for (var i = 0; i < this.image_list.length; i++) {
+          aa.push(this.image_list[i].url)
+        }
+        this.formobj.loanTemplateTrailer.vehTrailerCertificateFile = aa
+      } else {
+        this.formobj.loanTemplateTrailer.vehTrailerCertificateFile = []
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 140px !important;
+}
+.addinputInfo {
+  margin-left: 130px !important;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsYiban.vue

@@ -0,0 +1,429 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="12">
+              <div class="span-sty">模板名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.templateName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">选择预估报价单</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.showTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>车型确定</div>
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item><span>{{ formobj.vehModel }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24" class="tlineheightb">
+              <div class="span-sty">常用配置</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehModelConfig }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24" class="tlineheightb">
+              <div class="span-sty">更多配置</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehModelConfigMore }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">单台指导价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">合格证公告型号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehNoticeModel }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-show="formobj.install">
+            <div class="title titleOne">
+              <div>上装</div>
+            </div>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">上装名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.installNameValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">委改方式</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.refitMethodValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">供应商</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.refitFactory }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">货箱内部尺寸</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.wkSize }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">板材材质</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.plateMaterialValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">板材厚度</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.plateThickness }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">颜色</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.colorValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">融资价格</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.vehInstallPrice }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24" class="tlineheightb">
+                <div class="span-sty">更多配置</div>
+                <el-form-item><span>{{ formobj.loanTemplateInstall.moreConfig }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">备注说明</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateInstall.vehInstallRemark }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div v-show="formobj.trailer">
+            <div class="title titleOne">
+              <div>挂车</div>
+            </div>
+            <el-row>
+              <el-col :span="12">
+                <div class="span-sty">车型名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.modelTrailerName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">车辆品牌</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.brandName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">车辆型号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.carModelName }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">厂商名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.manufacturerName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6" class="tlineheightb">
+                <div class="span-sty">内部尺寸</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.insideSize }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">箱体颜色</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.boxColor }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">融资价格</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.vehTrailerPrice }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">更多配置</div>
+                <el-form-item><span>{{ formobj.loanTemplateTrailer.moreConfig }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">同车型合格证上传</div>
+                <el-form-item>
+                  <el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.loanTemplateTrailer.vehTrailerCertificateFile" :key="index" :src="item" :preview-src-list="formobj.loanTemplateTrailer.vehTrailerCertificateFile"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">备注说明</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanTemplateTrailer.vehTrailerRemark }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="title">
+            <div>消贷金融方案</div>
+          </div>
+          <financialschemeInfo ref="divInfo"/>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
+import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
+
+export default {
+  name: 'CustomizedFinancialSolutionsYiBan',
+  components: {
+    financialschemeInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      formobj: {
+        useOrgSid: '',
+        install: false,
+        loanTemplateInstall: {
+          colorValue: '',
+          installNameValue: '',
+          moreConfig: '',
+          plateMaterialValue: '',
+          plateThicknessBottom: '',
+          plateThicknessEdge: '',
+          plateThickness: '',
+          refitFactory: '',
+          refitMethodValue: '',
+          vehInstallPrice: '',
+          vehInstallRemark: '',
+          vehInstallModelSid: '',
+          wkSize: '',
+          wk_high: '',
+          wk_long: '',
+          wk_wide: ''
+        },
+        loanTemplateSolutions: {
+          saleOrderSid: '',
+          type: '',
+          isPack: '',
+          policyName: '',
+          policySid: '',
+          mainVehicleAmount: '',
+          accessoriesAmount: '',
+          trailerAmount: '',
+          purchaseTax: '',
+          premium: '',
+          loanTotal: '',
+
+          accessoriesAmountCb: false,
+          trailerAmountCb: false,
+          purchaseTaxCb: false,
+          premiumCb: false,
+
+          downPayRatio: '',
+          downPayAmount: '',
+          loanAmount: '',
+          loanPeriod: '',
+          bondRatio: '',
+          bondAmount: '',
+          factoryDiscount: '',
+          factoryDiscountUse: '',
+          policyYearRatio: '',
+          loanPayMoney: '',
+          loanInterest: '',
+          discountCar: '',
+          otherPolicyState: false,
+
+          otherPolicyName: '',
+          otherPolicySid: '',
+          otherPolicyAmount: '',
+          otherPolicyPeriod: '',
+
+          otherPolicyMonthlyRepay: '',
+          otherPolicyInterest: '',
+          otherPolicyYearRatio: '',
+
+          loanDownPay: '',
+          downPayAmountsRatio: '',
+          loanAmountTotal: '',
+          period: '',
+          monthlyRepay: '',
+          interest: '',
+          returnTime: '',
+
+          downPayAmounts: '',
+          bondAmounts: '',
+          depositPremium: '',
+          depositSettle: '',
+          serviceAmount: '',
+          proxyAccidentPremium: '',
+          registerAmount: '',
+          operationAmount: '',
+          vehOtherPrice: '',
+          otherAmount: '',
+          otherAmountRemark: '',
+          dealWay: '',
+          dealWayKey: '',
+          proxyPremium: '',
+          proxyPurchasetax: '',
+          proxyTotal: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          receivableTotal: '',
+          realTotal: '',
+          vehTotalPrice: '',
+          nominalPrice: ''
+        },
+        loanTemplateTrailer: {
+          boxColor: '',
+          brandName: '',
+          carModelName: '',
+          insideSize: '',
+          insideSizeHigh: '',
+          insideSizeLong: '',
+          insideSizeWide: '',
+          manufacturerName: '',
+          modelTrailerName: '',
+          moreConfig: '',
+          vehTrailerModelSid: '',
+          vehTrailerCertificateFile: [],
+          vehTrailerPrice: '',
+          vehTrailerRemark: ''
+        },
+        orgPath: '',
+        showTypeKey: '',
+        showTypeValue: '',
+        sid: '',
+        taskId: '',
+        templateName: '',
+        trailer: false,
+        instanceId: '',
+        userSid: '',
+        vehModel: '',
+        vehModelConfig: '',
+        vehModelConfigMore: '',
+        vehModelConfigSid: '',
+        vehModelSid: '',
+        vehNoticeModel: '',
+        vehNoticeModelSid: '',
+        vehPrice: ''
+      },
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '公司定制金融方案详情'
+      req.fetchBySid({ sid: sid }).then((resp) => {
+        if (resp.success) {
+          this.formobj = resp.data
+          this.$nextTick(() => {
+            this.$refs['divInfo'].showInfo(this.formobj.loanTemplateSolutions)
+          })
+        }
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 140px !important;
+}
+.addinputInfo {
+  margin-left: 130px !important;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/relation/guacheselect.vue

@@ -0,0 +1,202 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar view-title="挂车车型管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">
+            {{ isSearchShow ? "隐藏查询条件" : "显示查询条件" }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header" label-width="100px">
+              <el-row>
+                <el-form-item label="车辆品牌">
+                  <el-input v-model="queryParams.params.brandName" clearable placeholder=""/>
+                </el-form-item>
+                <el-form-item label="车辆型号">
+                  <el-input v-model="queryParams.params.carModelName" clearable placeholder=""/>
+                </el-form-item>
+                <el-form-item label="厂商名称">
+                  <el-select v-model="queryParams.params.manufacturerSid" filterable placeholder="请选择">
+                    <el-option v-for="item in manufacturer_list" :key="item.sid" :label="item.manufacturerName" :value="item.sid">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="挂车类型">
+                  <el-select v-model="queryParams.params.trailerTypeKey" filterable placeholder="请选择">
+                    <el-option v-for="item in trailerType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-row>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--Start 项目列表头部-->
+        <div class="listtop">
+          <div class="tit">挂车列表</div>
+          <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
+        </div>
+        <!--End 项目列表头部-->
+        <!--Start 项目列表-->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+            <el-table-column width="60" fixed label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" fixed width="80" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="small" @click="handleConfirm(scope.row)">确认</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="brandName" width="110" label="车辆品牌" align="center"/>
+            <el-table-column prop="carModelName" width="110" label="车辆型号" align="center"/>
+            <el-table-column prop="manufacturerName" label="厂商名称" align="center"/>
+            <el-table-column prop="trailerTypeValue" label="挂车类型" align="center"/>
+            <el-table-column prop="appearanceSize" label="外观尺寸" header-align="center" align="left"/>
+            <el-table-column prop="saleGuidancePrice" width="110" label="销售指导价" align="center"/>
+          </el-table>
+        </div>
+        <!--End 项目列表-->
+        <div class="pages">
+          <!-- 翻页 -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" @pagination="loadList"/>
+        </div>
+      </div>
+    </div>
+    <!--End 查询和其列表部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import { getGysTypeByOrgSid, getOrgSidByPath, typeValues } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'GuaCheSelect',
+  components: {
+    ButtonBar,
+    Pagination,
+    pageye
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      tableLoading: false,
+      dataList: [],
+      manufacturer_list: [],
+      trailerType_list: [],
+      queryParams: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          brandName: '',
+          carModelName: '',
+          manufacturerSid: '',
+          trailerTypeKey: '',
+          useOrgSid: ''
+        }
+      }
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'trailerType' }).then((res) => {
+        if (res.success) {
+          this.trailerType_list = res.data
+        }
+      })
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.queryParams.params.useOrgSid = res.data
+          getGysTypeByOrgSid({ orgSid: res.data, supplierType: '0002' }).then((resp) => {
+            if (resp.success) {
+              this.manufacturer_list = resp.data
+            }
+          })
+          this.loadList()
+        }
+      })
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    showData() {
+      this.init()
+    },
+    loadList() {
+      this.tableLoading = true
+      req.listPageByGC(this.queryParams).then((resp) => {
+        if (resp.success) {
+          this.tableLoading = false
+          this.queryParams.total = resp.data.total
+          this.dataList = resp.data.records
+        } else {
+          this.dataList = []
+          this.queryParams.total = 0
+        }
+      })
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          brandName: '',
+          carModelName: '',
+          manufacturerSid: '',
+          trailerTypeKey: '',
+          useOrgSid: ''
+        }
+      }
+      this.init()
+    },
+    handleConfirm(row) {
+      this.$emit('backData', row)
+    },
+    doClose() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/relation/modelSelect.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="app-container">
+    <div>
+      <button-bar view-title="车型常用列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header" label-width="100px">
+              <el-form-item label="车型:">
+                <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="常用配置:">
+                <el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+              <el-form-item label="内部编码:">
+                <el-input v-model="listQuery.params.insideCode" placeholder="" clearable class="filter-item"/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handresetting">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <div class="">
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%">
+            <el-table-column width="60" fixed label="编号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" fixed width="80" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="small" @click="handleConfirm(scope.row)">确认</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="品牌" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.brandName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型编码" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleTypeCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="车型" align="center" width="250">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleAlias }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="配置编码" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="常用配置" header-align="center" align="left">
+              <template slot-scope="scope">
+                <span>{{ scope.row.configName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="内部编码" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.insideCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="销售指导价(元)" width="130" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.guidedPrice }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
+
+export default {
+  name: 'ModelSelect',
+  components: {
+    Pagination,
+    ButtonBar
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 5,
+        params: {
+          vehicleAlias: '',
+          configName: '',
+          useOrgSid: '',
+          vehicleStateValue: '',
+          carBrandSid: '',
+          insideCode: '',
+          sidList: []
+        },
+        total: 1
+      }
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.listPageByModelAndConfig(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handresetting() {
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.vehicleAlias = ''
+      this.listQuery.params.configName = ''
+      this.listQuery.params.useOrgSid = ''
+      this.listQuery.params.vehicleStateValue = ''
+      this.listQuery.params.insideCode = ''
+      this.getList()
+    },
+    showData(value, carBrandSid, createOrgSid) {
+      const aa = []
+      if (value.length > 0) {
+        for (var i = 0; i < value.length; i++) {
+          aa.push({
+            modelSid: value[i].vehicleSid,
+            configSid: value[i].configSid
+          })
+        }
+        this.listQuery.params.sidList = aa
+      } else {
+        this.listQuery.params.sidList = []
+      }
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
+      this.listQuery.params.carBrandSid = carBrandSid
+      this.listQuery.params.useOrgSid = createOrgSid
+      this.getList()
+    },
+    handleConfirm(row) {
+      this.$emit('backData', row)
+    },
+    // 返回
+    doClose() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/relation/shangzhuangselect.vue

@@ -0,0 +1,262 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar view-title="上装配置管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">
+            {{ isSearchShow ? "隐藏查询条件" : "显示查询条件" }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header" label-width="100px">
+              <el-form-item label="车辆功能">
+                <el-select v-model="queryParams.params.vehicleTypeKey" filterable placeholder="请选择">
+                  <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="委改方式">
+                <el-select v-model="queryParams.params.refitMethodKey" filterable placeholder="请选择">
+                  <el-option v-for="item in refitMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="供应商">
+                <el-select v-model="queryParams.params.refitFactorySid" filterable placeholder="请选择">
+                  <el-option v-for="item in refitFactory_list" :key="item.sid" :label="item.manufacturerName" :value="item.sid">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="上装名称">
+                <el-select v-model="queryParams.params.installNameKey" filterable placeholder="请选择">
+                  <el-option v-for="item in installName_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="颜色">
+                <el-select v-model="queryParams.params.colorKey" filterable placeholder="请选择">
+                  <el-option v-for="item in color_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="板材材质">
+                <el-select v-model="queryParams.params.plateMaterialKey" filterable placeholder="请选择">
+                  <el-option v-for="item in plateMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--Start 项目列表头部-->
+        <div class="listtop">
+          <div class="tit">上装配置列表</div>
+          <pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="init"/>
+        </div>
+        <!--End 项目列表头部-->
+        <!--Start 项目列表-->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+            <el-table-column width="70px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="small" @click="handleSelect(scope.row)">确认</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="vehicleTypeValue" label="车辆功能" align="center"/>
+            <el-table-column prop="installNameValue" label="上装名称" align="center"/>
+            <el-table-column prop="refitMethodValue" label="委改方式" align="center"/>
+            <el-table-column prop="refitFactory" label="供应商" align="center"/>
+            <el-table-column prop="wk" label="货箱内部尺寸" header-align="center" align="left" width="200"/>
+            <el-table-column prop="colorValue" label="颜色" align="center"/>
+            <el-table-column prop="plateMaterialValue" label="板材材质" align="center"/>
+            <el-table-column prop="plateThickness" label="板材厚度" header-align="center" align="left" width="150"/>
+            <el-table-column prop="tarpaulinSlide" label="篷布滑道" align="center"/>
+            <el-table-column prop="refrigerator" label="冷藏冷机" align="center"/>
+            <el-table-column prop="selfUnHyCoPl" label="自卸液压盖板" align="center" width="150"/>
+            <el-table-column prop="floorHeating" label="底板加热" align="center"/>
+          </el-table>
+        </div>
+        <!--End 项目列表-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="init"/>
+        </div>
+      </div>
+    </div>
+    <!--End 查询和其列表部分-->
+  </div>
+</template>
+
+<script>
+import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import { getGysByOrgSid, getOrgSidByPath, typeValues } from '@/api/Common/dictcommons'
+
+export default {
+  name: 'ShangZhuangSelect',
+  components: {
+    ButtonBar,
+    Pagination,
+    pageye
+  },
+  data() {
+    return {
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      tableLoading: false,
+      dataList: [],
+      installName_list: [],
+      vehicleType_list: [],
+      refitMethod_list: [],
+      color_list: [],
+      refitFactory_list: [],
+      plateMaterial_list: [],
+      queryParams: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          vehicleTypeKey: '',
+          installNameKey: '',
+          refitMethodKey: '',
+          refitFactorySid: '',
+          colorKey: '',
+          plateMaterial: '',
+          createOrgSid: ''
+        }
+      },
+      multipleSelection: []
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.queryParams.params.createOrgSid = res.data
+          getGysByOrgSid({ orgSid: res.data }).then((res) => {
+            if (res.success) {
+              this.refitFactory_list = res.data
+            }
+          })
+          this.loadList()
+        }
+      })
+      this.DataDictionary()
+    },
+    DataDictionary() {
+      // 上装名称
+      typeValues({ type: 'topName' }).then((res) => {
+        if (res.success) {
+          this.installName_list = res.data
+        }
+      })
+      // 车辆功能
+      typeValues({ type: 'vehicleFunction' }).then((res) => {
+        if (res.success) {
+          this.vehicleType_list = res.data
+        }
+      })
+      typeValues({ type: 'bodyColor' }).then((res) => {
+        if (res.success) {
+          this.color_list = res.data
+        }
+      })
+      typeValues({ type: 'refitMethod' }).then((res) => {
+        if (res.success) {
+          this.refitMethod_list = res.data
+        }
+      })
+      typeValues({ type: 'plateMaterial' }).then((res) => {
+        if (res.success) {
+          this.plateMaterial_list = res.data
+        }
+      })
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    showData() {
+      this.init()
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.init()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          vehicleTypeKey: '',
+          installNameKey: '',
+          refitMethodKey: '',
+          refitFactorySid: '',
+          colorKey: '',
+          plateMaterial: '',
+          createOrgSid: ''
+        }
+      }
+      this.init()
+    },
+    loadList() {
+      this.tableLoading = true
+      req.listPageBySZ(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
+        } else {
+          this.queryParams.total = 0
+          this.dataList = []
+        }
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    handleSelect(row) {
+      this.$emit('backData', row)
+    },
+    doClose() {
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue

@@ -0,0 +1,492 @@
+<template>
+  <div style="margin-top: 2px">
+    <div v-show="viewState == 1">
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div class="title titleOne">
+          <div>消贷金融方案</div>
+          <el-button type="primary" size="mini" @click="financialComputing">金融计算</el-button>
+        </div>
+        <div>
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="6">
+              <div class="span-sty">是否打包</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }}</span></el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <div class="span-sty">产品政策</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">融资项目</div>
+              <el-form-item>
+                <div class="addinputInfo">
+                  <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
+                  <span>配件{{ formobj.accessoriesAmount }} 元</span>
+                  <span>挂车{{ formobj.trailerAmount }} 元</span>
+                  <span>保险{{ formobj.premium }} 元</span>
+                  <span>购置税{{ formobj.purchaseTax }} 元</span>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <div class="span-sty">融资项目总额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">首付比例(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">首付金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">产品贷款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">产品期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanPeriod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">贷款保证金比例(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bondRatio }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">贷款保证金</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bondAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">厂家贴息</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">贴息用途</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">年利率(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">月还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanPayMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">利息总额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanInterest }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div v-show="formobj.factoryDiscountUseKey == '01'">
+                <div class="span-sty">贴息抵车款</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+          <div v-show="formobj.otherPolicyState">
+            <div class="title">其它融</div>
+            <el-row>
+              <el-col :span="12">
+                <div class="span-sty">其它融名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">贷款金额</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyAmount }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">期数</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyPeriod }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">年利率(%)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">月还金额</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyMonthlyRepay }}</span></el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <div class="span-sty">利息总额</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyInterest }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="title">方案汇总</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">融资首付</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanDownPay }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">实际首付比例(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayAmountsRatio }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">总贷款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.loanAmountTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">期数</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.period }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6"></el-col>
+            <el-col :span="6">
+              <div class="span-sty">月还金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.monthlyRepay }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">利息总额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.interest }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">预计首款还款日</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">应收明细</div>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">融资首付</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.downPayAmounts }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">贷款保证金</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.bondAmounts }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">保险保证金</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.depositPremium }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">落户保证金</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.depositSettle }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">服务费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.serviceAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">代收意外险</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyAccidentPremium }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">上牌费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.registerAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">运管费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.operationAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">补车价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehOtherPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">其它费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.otherAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">其它费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.otherAmountRemark }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">办理方式选择</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
+            <el-col :span="6">
+              <div class="span-sty">代收费用合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <div class="span-sty">代收首年保险费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <div class="span-sty">代收购置税</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">应收合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
+            <el-col :span="6">
+              <div class="span-sty">抵顶费用合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <div class="span-sty">抵顶首年保险费</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
+            </el-col>
+            <el-col :span="9">
+              <div class="span-sty">抵顶购置税</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">实收合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.realTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">车辆总价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehTotalPrice }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <div class="span-sty">名义(留购)价</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.nominalPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item><span class="addinputInfo">注：结清时需缴纳此费用</span></el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </div>
+    <financialscheme v-show="viewState == 2" ref="divCount" @backData="backData" @doback="resetState"/>
+  </div>
+</template>
+<script>
+import financialscheme from './financialscheme'
+
+export default {
+  name: '',
+  components: {
+    financialscheme
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      formobj: {
+        saleOrderSid: '',
+        type: '',
+        isPack: '',
+        policyName: '',
+        policySid: '',
+        mainVehicleAmount: '',
+        accessoriesAmount: '',
+        trailerAmount: '',
+        purchaseTax: '',
+        premium: '',
+        loanTotal: '',
+
+        accessoriesAmountCb: false,
+        trailerAmountCb: false,
+        purchaseTaxCb: false,
+        premiumCb: false,
+
+        downPayRatio: '',
+        downPayAmount: '',
+        loanAmount: '',
+        loanPeriod: '',
+        bondRatio: '',
+        bondAmount: '',
+        factoryDiscount: '',
+        factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
+        policyYearRatio: '',
+        loanPayMoney: '',
+        loanInterest: '',
+        discountCar: '',
+        otherPolicyState: false,
+
+        otherPolicyName: '',
+        otherPolicySid: '',
+        otherPolicyAmount: '',
+        otherPolicyPeriod: '',
+
+        otherPolicyMonthlyRepay: '',
+        otherPolicyInterest: '',
+        otherPolicyYearRatio: '',
+
+        loanDownPay: '',
+        downPayAmountsRatio: '',
+        loanAmountTotal: '',
+        period: '',
+        monthlyRepay: '',
+        interest: '',
+        returnTime: '',
+
+        downPayAmounts: '',
+        bondAmounts: '',
+        depositPremium: '',
+        depositSettle: '',
+        serviceAmount: '',
+        proxyAccidentPremium: '',
+        registerAmount: '',
+        operationAmount: '',
+        vehOtherPrice: '',
+        otherAmount: '',
+        otherAmountRemark: '',
+        dealWay: '',
+        dealWayKey: '',
+        proxyPremium: '',
+        proxyPurchasetax: '',
+        proxyTotal: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        receivableTotal: '',
+        realTotal: '',
+        vehTotalPrice: '',
+        nominalPrice: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(value) {
+      this.formobj = value
+    },
+    financialComputing() {
+      this.viewState = 2
+      this.$refs['divCount'].showAdd(this.formobj)
+    },
+    backData(value) {
+      this.viewState = 1
+      this.formobj = value
+    },
+    backParameters() {
+      this.$emit('backParameters', this.formobj)
+      this.formobj = {
+        saleOrderSid: '',
+        type: '',
+        isPack: '',
+        policyName: '',
+        policySid: '',
+        mainVehicleAmount: '',
+        accessoriesAmount: '',
+        trailerAmount: '',
+        purchaseTax: '',
+        premium: '',
+        loanTotal: '',
+
+        accessoriesAmountCb: false,
+        trailerAmountCb: false,
+        purchaseTaxCb: false,
+        premiumCb: false,
+
+        downPayRatio: '',
+        downPayAmount: '',
+        loanAmount: '',
+        loanPeriod: '',
+        bondRatio: '',
+        bondAmount: '',
+        factoryDiscount: '',
+        factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
+        policyYearRatio: '',
+        loanPayMoney: '',
+        loanInterest: '',
+        discountCar: '',
+        otherPolicyState: false,
+
+        otherPolicyName: '',
+        otherPolicySid: '',
+        otherPolicyAmount: '',
+        otherPolicyPeriod: '',
+
+        otherPolicyMonthlyRepay: '',
+        otherPolicyInterest: '',
+        otherPolicyYearRatio: '',
+
+        loanDownPay: '',
+        downPayAmountsRatio: '',
+        loanAmountTotal: '',
+        period: '',
+        monthlyRepay: '',
+        interest: '',
+        returnTime: '',
+
+        downPayAmounts: '',
+        bondAmounts: '',
+        depositPremium: '',
+        depositSettle: '',
+        serviceAmount: '',
+        proxyAccidentPremium: '',
+        registerAmount: '',
+        operationAmount: '',
+        vehOtherPrice: '',
+        otherAmount: '',
+        otherAmountRemark: '',
+        dealWay: '',
+        dealWayKey: '',
+        proxyPremium: '',
+        proxyPurchasetax: '',
+        proxyTotal: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        receivableTotal: '',
+        realTotal: '',
+        vehTotalPrice: '',
+        nominalPrice: ''
+      }
+    },
+    resetState() {
+      this.viewState = 1
+    }
+  }
+}
+</script>
+
+<style scoped>
+.formaddcopy02 {
+  padding: 0px;
+}
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+</style>

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeInfo.vue

@@ -1,21 +1,15 @@
 <template>
-  <div class="app-container">
-    <div class="tab-header webtop">
-      <div>{{ viewTitle }}</div>
-      <div>
-        <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
-      </div>
-    </div>
-    <div class="">
-      <el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
-        <div v-if="formobj.typeKey !== '02'">
+  <div>
+    <div>
+      <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
+        <div>
           <el-row style="border-top: 1px solid #E0E3EB">
             <el-col :span="6">
               <div class="span-sty">是否打包</div>
               <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }}</span></el-form-item>
             </el-col>
             <el-col :span="18">
-              <div class="span-sty">资方及产品政策</div>
+              <div class="span-sty">产品政策</div>
               <el-form-item><span class="addinputInfo">{{ formobj.policyName }}</span></el-form-item>
             </el-col>
           </el-row>
@@ -25,11 +19,10 @@
               <el-form-item>
                 <div class="addinputInfo">
                   <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
-                  <span>融资票据{{ formobj.accessoriesAmount }} 元</span>
+                  <span>配件{{ formobj.accessoriesAmount }} 元</span>
                   <span>挂车{{ formobj.trailerAmount }} 元</span>
                   <span>保险{{ formobj.premium }} 元</span>
                   <span>购置税{{ formobj.purchaseTax }} 元</span>
-                  <span>车损上浮{{ formobj.vehDamageFloat }} 元</span>
                 </div>
               </el-form-item>
             </el-col>
@@ -40,7 +33,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">首付比例</div>
+              <div class="span-sty">首付比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -58,7 +51,7 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <div class="span-sty">贷款保证金比例</div>
+              <div class="span-sty">贷款保证金比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.bondRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -70,11 +63,15 @@
               <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscount }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">年利率</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+              <div class="span-sty">贴息用途</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6">
+              <div class="span-sty">年利率(%)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
+            </el-col>
             <el-col :span="6">
               <div class="span-sty">月还金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanPayMoney }}</span></el-form-item>
@@ -83,9 +80,11 @@
               <div class="span-sty">利息总额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.loanInterest }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
+            <el-col :span="6">
+              <div v-show="formobj.factoryDiscountUseKey == '01'">
+                <div class="span-sty">贴息抵车款</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
+              </div>
             </el-col>
           </el-row>
           <div v-show="formobj.otherPolicyState">
@@ -105,6 +104,10 @@
               </el-col>
             </el-row>
             <el-row>
+              <el-col :span="6">
+                <div class="span-sty">年利率</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
+              </el-col>
               <el-col :span="6">
                 <div class="span-sty">月还金额</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyMonthlyRepay }}</span></el-form-item>
@@ -113,10 +116,6 @@
                 <div class="span-sty">利息总额</div>
                 <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyInterest }}</span></el-form-item>
               </el-col>
-              <el-col :span="6">
-                <div class="span-sty">年利率</div>
-                <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyYearRatio }}</span></el-form-item>
-              </el-col>
             </el-row>
           </div>
           <div class="title">方案汇总</div>
@@ -126,7 +125,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.loanDownPay }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
-              <div class="span-sty">实际首付比例</div>
+              <div class="span-sty">实际首付比例(%)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.downPayAmountsRatio }}</span></el-form-item>
             </el-col>
             <el-col :span="6">
@@ -139,11 +138,12 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6"></el-col>
             <el-col :span="6">
               <div class="span-sty">月还金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.monthlyRepay }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="6">
               <div class="span-sty">利息总额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.interest }}</span></el-form-item>
             </el-col>
@@ -204,10 +204,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="24">
               <div class="span-sty">办理方式选择</div>
               <el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
             </el-col>
+          </el-row>
+          <el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
+            <el-col :span="6">
+              <div class="span-sty">代收费用合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
+            </el-col>
             <el-col :span="9">
               <div class="span-sty">代收首年保险费</div>
               <el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
@@ -223,7 +229,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
             <el-col :span="6">
               <div class="span-sty">抵顶费用合计</div>
               <el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
@@ -259,28 +265,6 @@
             </el-col>
           </el-row>
         </div>
-        <div v-if="formobj.typeKey == '02'">
-          <el-row style="border-top: 1px solid #E0E3EB">
-            <el-col :span="8">
-              <div class="span-sty">厂家贴息</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.factoryDiscount }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">厂家贴息用途</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>服务费</div>
-              <el-form-item>
-                <span class="addinputInfo">{{ formobj.serviceAmount }}</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
       </el-form>
     </div>
   </div>
@@ -288,7 +272,7 @@
 <script>
 
 export default {
-  name: 'JinRongFangAnInfo',
+  name: '',
   data() {
     return {
       viewTitle: '',
@@ -303,6 +287,8 @@ export default {
     showInfo(value) {
       this.viewTitle = '金融方案'
       this.formobj = value
+      console.log(value, 8888)
+      console.log(this.formobj, 9999)
     },
     handleReturn() {
       this.$emit('doback')
@@ -312,6 +298,9 @@ export default {
 </script>
 
 <style scoped>
+.formaddcopy02 {
+  padding: 0px;
+}
 .span-sty {
   width: 130px !important;
 }

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.SolutionsDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
 import com.yxt.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.SolutionsDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
 import com.yxt.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.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDto;
+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}")
-	//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();
+    //@Update("update loan_homevisit_investigate_file set name=#{msg} where id=#{id}")
+    //IPage<LoanHomevisitInvestigateFileVo> voPage(IPage<LoanHomevisitInvestigateFile> page, @Param(Constants.WRAPPER) QueryWrapper<LoanHomevisitInvestigateFile> qw);
 
-	@Select("select * from loan_homevisit_investigate_file where mainSid = #{sid} and attachType = #{attachType}")
-    List<LoanHomevisitInvestigateFileDetailsVo> selByMainSidAndTypeKey(@Param("sid") String sid,@Param("attachType") String attachType);
+    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();
+
+    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>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileVo">
-		SELECT * FROM loan_homevisit_investigate_file <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileVo">
-		SELECT * FROM loan_homevisit_investigate_file <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatefile.LoanHomevisitInvestigateFileVo">
+        SELECT * FROM loan_homevisit_investigate_file
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </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>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsVo">
-		SELECT * FROM loan_homevisit_investigate_operations <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsVo">
-		SELECT * FROM loan_homevisit_investigate_operations <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomevisitInvestigateOperationsVo">
+        SELECT * FROM loan_homevisit_investigate_operations
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </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>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderVo">
-		SELECT * FROM loan_homevisit_investigate_order <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderVo">
-		SELECT * FROM loan_homevisit_investigate_order <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomevisitInvestigateOrderVo">
+        SELECT * FROM loan_homevisit_investigate_order
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </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>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo">
-		SELECT * FROM loan_homevisit_investigate_otherpeo <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo">
-		SELECT * FROM loan_homevisit_investigate_otherpeo <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo">
+        SELECT * FROM loan_homevisit_investigate_otherpeo
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </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>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyVo">
-		SELECT * FROM loan_homevisit_investigate_property <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyVo">
-		SELECT * FROM loan_homevisit_investigate_property <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomevisitInvestigatePropertyVo">
+        SELECT * FROM loan_homevisit_investigate_property
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </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>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportVo">
-		SELECT * FROM loan_homevisit_investigate_transport <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportVo">
-		SELECT * FROM loan_homevisit_investigate_transport <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo"
+            resultType="com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomevisitInvestigateTransportVo">
+        SELECT * FROM loan_homevisit_investigate_transport
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </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.SolutionsDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
 import com.yxt.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.SolutionsDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.*;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateQuery;
 import com.yxt.anrui.riskcenter.api.loansolutions.calculate.CalculateVo;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
+import com.yxt.anrui.riskcenter.biz.loanfinotherPolicy.LoanFinOtherPolicyService;
 import com.yxt.anrui.riskcenter.biz.loanfinpolicy.LoanFinPolicyService;
 import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailService;
 import com.yxt.anrui.riskcenter.biz.loansolutionsotherpolicy.LoanSolutionsOtherpolicyService;
@@ -22,12 +26,12 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -57,6 +61,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
     private FlowTaskFeign flowTaskFeign;
     @Autowired
     private LoanFinPolicyService loanFinPolicyService;
+    @Autowired
+    private LoanFinOtherPolicyService loanFinOtherPolicyService;
 
     public ResultBean<SolutionsDetailsVo> selectDetails(String saleOrderSid) {
         ResultBean<SolutionsDetailsVo> rb = ResultBean.fireFail();
@@ -831,10 +837,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutions.setOtherPolicyState(1);
             String loanDownPay = dto.getLoanDownPay();
             loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+
         } else {
             BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
             String loanDownPay = dto.getLoanDownPay();
             loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyAmount(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyInterest(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyMonthlyRepay(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyPeriod("");
+            loanSolutionsOtherpolicy.setOtherPolicyYearRatio("");
+            loanSolutionsOtherpolicy.setOtherPolicyName("");
             loanSolutions.setOtherPolicyState(0);
         }
         baseMapper.insert(loanSolutions);
@@ -887,8 +900,16 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
             loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
         } else {
-            loanSolutionsDetail.setOffsetPremium(StringUtils.isNotBlank(offsetPremium) ? new BigDecimal(offsetPremium) : BigDecimal.ZERO);
-            loanSolutionsDetail.setOffsetPurchasetax(StringUtils.isNotBlank(offsetPurchasetax) ? new BigDecimal(offsetPurchasetax) : BigDecimal.ZERO);
+            if (!dto.isPremiumCb()) {
+                loanSolutionsDetail.setOffsetPremium(BigDecimal.ZERO);
+            } else {
+                loanSolutionsDetail.setOffsetPremium(StringUtils.isNotBlank(offsetPremium) ? new BigDecimal(offsetPremium) : BigDecimal.ZERO);
+            }
+            if (!dto.isPurchaseTaxCb()) {
+                loanSolutionsDetail.setOffsetPurchasetax(BigDecimal.ZERO);
+            } else {
+                loanSolutionsDetail.setOffsetPurchasetax(StringUtils.isNotBlank(offsetPurchasetax) ? new BigDecimal(offsetPurchasetax) : BigDecimal.ZERO);
+            }
         }
         String proxyTotal = dto.getProxyTotal();
         loanSolutionsDetail.setProxyTotal(StringUtils.isNotBlank(proxyTotal) ? new BigDecimal(proxyTotal) : BigDecimal.ZERO);
@@ -1383,14 +1404,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;
+}