Merge remote-tracking branch 'origin/master'

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

@@ -12,12 +12,12 @@
               <el-form-item label="分公司">
                 <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请人">
-                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
-              </el-form-item>
               <el-form-item label="申请部门">
                 <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="申请日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
@@ -57,12 +57,12 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center" width="150">
+            <el-table-column label="分公司" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.useOrgName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请部门" align="center" width="120">
+            <el-table-column label="申请部门" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.deptName }}</span>
               </template>

anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrolAdd.vue

@@ -50,13 +50,13 @@
                 <el-button type="danger" size="small" @click="toDelete(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="customerName" 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="firstBeDate" label="首次逾期日期" align="center" width="120"/>
             <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/remotedecontrol/remotedecontrolInfo.vue

@@ -42,13 +42,13 @@
           </div>
           <el-table :key="tableKey" :data="formobj.loanVehClearanceVehList" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="customerName" 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="firstBeDate" label="首次逾期日期" align="center" width="120"/>
             <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/returnreserve/returnreserve.vue

@@ -12,12 +12,12 @@
               <el-form-item label="分公司">
                 <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请人">
-                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
-              </el-form-item>
               <el-form-item label="申请部门">
                 <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="申请日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
@@ -88,12 +88,12 @@
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="分公司" align="center" width="150">
+            <el-table-column label="分公司" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.useOrgName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申请部门" align="center" width="120">
+            <el-table-column label="申请部门" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.deptName }}</span>
               </template>
@@ -113,7 +113,7 @@
                 <span>{{ scope.row.modifyTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="贷款合同编号" align="center" width="120">
+            <el-table-column label="贷款合同编号" align="center" width="160">
               <template slot-scope="scope">
                 <span>{{ scope.row.loanContractNo }}</span>
               </template>
@@ -133,7 +133,7 @@
                 <span>{{ scope.row.bankName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="资方合同编号" align="center" width="120">
+            <el-table-column label="资方合同编号" align="center" width="160">
               <template slot-scope="scope">
                 <span>{{ scope.row.bankContractNo }}</span>
               </template>

anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolDaiBan.vue

@@ -45,13 +45,13 @@
           </div>
           <el-table :key="tableKey" :data="formobj.loanVehClearanceVehList" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="customerName" 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="firstBeDate" label="首次逾期日期" align="center" width="120"/>
             <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/yuanchengjiekongFlow/remotedecontrolEdit.vue

@@ -49,11 +49,11 @@
                 <el-button type="danger" size="small" @click="toDelete(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
             <el-table-column prop="firstBeDate" label="首次逾期日期" align="center" width="120"/>

anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolYiBan.vue

@@ -42,11 +42,11 @@
           </div>
           <el-table :key="tableKey" :data="formobj.loanVehClearanceVehList" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="120" />
+            <el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
             <el-table-column prop="vinNo" label="车架号" align="center" width="100"/>
             <el-table-column prop="carNum" label="车牌号" align="center" width="100" />
             <el-table-column prop="bankName" label="资方" align="center" width="100" />
-            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="120"/>
+            <el-table-column prop="bankContractNo" label="资方合同编号" align="center" width="160"/>
             <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100"/>
             <el-table-column prop="firstBeDate" label="首次逾期日期" align="center" width="120"/>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereExportVo.java

@@ -19,9 +19,9 @@ public class LoanBePadsincereExportVo implements Vo {
     @ExportEntityMap(CnName = "期数", EnName = "period")
     private String period;
     @ExportEntityMap(CnName = "逾期本金", EnName = "bePrincipal")
-    private String bePrincipal;
+    private Double bePrincipal;
     @ExportEntityMap(CnName = "逾期罚息", EnName = "beDefInter")
-    private String beDefInter;
+    private Double beDefInter;
     @ExportEntityMap(CnName = "付款账户", EnName = "paymentAccount")
     private String paymentAccount;
     @ExportEntityMap(CnName = "付款账号", EnName = "paymentNum")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@@ -437,9 +437,9 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
                     sysBeMoney = "0";
                 }
                 loanBePadsincereVehDetailsVo.setSysBeMoney(sysBeMoney);
-                loanBePadsincereVehDetailsVo.setBankBeMoney(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBePrincipal()) / loanRepaymentScheduleDetailsVos.size()));
-                loanBePadsincereVehDetailsVo.setBankBeInter(String.valueOf(Integer.parseInt(bePadsincereExcelInfo.getBeDefInter()) / loanRepaymentScheduleDetailsVos.size()));
-                loanBePadsincereVehDetailsVo.setPadMoney(String.valueOf(Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeMoney()) + Integer.parseInt(loanBePadsincereVehDetailsVo.getBankBeInter())));
+                loanBePadsincereVehDetailsVo.setBankBeMoney(String.valueOf(Double.parseDouble(bePadsincereExcelInfo.getBePrincipal()) / loanRepaymentScheduleDetailsVos.size()));
+                loanBePadsincereVehDetailsVo.setBankBeInter(String.valueOf(Double.parseDouble(bePadsincereExcelInfo.getBeDefInter()) / loanRepaymentScheduleDetailsVos.size()));
+                loanBePadsincereVehDetailsVo.setPadMoney(String.valueOf(Double.parseDouble(loanBePadsincereVehDetailsVo.getBankBeMoney()) + Double.parseDouble(loanBePadsincereVehDetailsVo.getBankBeInter())));
                 loanBePadsincereVehDetailsVo.setPaymentAccount(bePadsincereExcelInfo.getPaymentAccount());
                 loanBePadsincereVehDetailsVo.setPaymentNum(bePadsincereExcelInfo.getPaymentNum());
                 loanBePadsincereVehDetailsVo.setBankCollectionAcc(bePadsincereExcelInfo.getBankCollectionAcc());