Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/advancerequest/advancerequestAdd.vue

@@ -58,7 +58,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="140" />

anrui-riskcenter-ui/src/views/advancerequest/advancerequestInfo.vue

@@ -51,7 +51,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />

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

@@ -49,7 +49,7 @@
               </el-form-item>
               <el-form-item label="远程控制状态">
                 <el-select v-model="listQuery.params.lockCarState" clearable placeholder="请选择" filterable>
-                  <el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  <el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -75,7 +75,7 @@
             <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="165"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="repaymentName" label="还款操作人" align="center" width="150"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100"/>
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100"/>

anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue

@@ -49,7 +49,7 @@
               </el-form-item>
               <el-form-item label="远程控制状态">
                 <el-select v-model="listQuery.params.lockCarState" clearable placeholder="请选择" filterable>
-                  <el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  <el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -75,7 +75,7 @@
             <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="165"/>
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100"/>
-            <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
+            <el-table-column prop="borrowerName" label="贷款人" align="center" min-width="100"/>
             <el-table-column prop="repaymentName" label="还款操作人" align="center" width="150"/>
             <el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100"/>
             <el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100"/>

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestDaiBan.vue

@@ -54,7 +54,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestEdit.vue

@@ -57,7 +57,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="140" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="80" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="140" />

anrui-riskcenter-ui/src/views/workFlow/diankuanFlow/advancerequestYiBan.vue

@@ -51,7 +51,7 @@
             <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
             <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160" />
-            <el-table-column prop="customer" label="客户名称" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="130" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" width="100" />
             <el-table-column prop="sysBeMoney" label="平台逾期月还" align="center" width="120" />

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java

@@ -31,6 +31,8 @@ public class LoanBeCollectionRecordVehInit {
     private String loanName;
     @ApiModelProperty("贷款合同编号")
     private String loanContractNo;
+    @ApiModelProperty("资方合同编号")
+    private String bankContractNo;
     @ApiModelProperty("资方")
     private String bankName;
     @ApiModelProperty("首次逾期日期")
@@ -46,6 +48,8 @@ public class LoanBeCollectionRecordVehInit {
     private String salesOrderSid;
     @ApiModelProperty("销售订单车辆sid")
     private String saleVehSid;
+    @ApiModelProperty("远程控制状态")
+    private String lockCarState;
 
     @ApiModelProperty
     private List<LoanBeCollectionVehFile> sids;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -456,6 +456,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
         for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
             LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo = new LoanBeCollectionVehDetailsVo();
             BeanUtil.copyProperties(loanBeCollectionRecordVehInit, loanBeCollectionVehDetailsVo);
+            loanBeCollectionVehDetailsVo.setBorrowerName(loanBeCollectionRecordVehInit.getLoanName());
             //远程控制费用获取
             int i = loanBeCollectionVehService.selBjBySaleVehSid(loanBeCollectionRecordVehInit.getSaleVehSid());
             String parameterValue = sysParameterFeign.fetchByParNo("FK_YCKZSFGZ").getData();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -143,6 +143,7 @@
                 a1.customer AS custName,
                 a1.mobile AS custPhone,
                 a1.`loanContractNo`,
+                a1.bankContractNo,
                 a1.`bankName`,
                 a1.borrowerName AS loanName,
                 a1.vehMark AS carNum,
@@ -200,6 +201,7 @@
                 lrpd.sid,
                 lrpd.busVinSid,
                 lrpd.`loanContractNo`,
+                lrpd.`bankContractNo`,
                 lrpd.`vinNo`,
                 lrpd.`bankName`,
                 lrpd.borrowerName,