From 830ccdad26e85cac003bd00fe95efe4cefc5d7e9 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 18 Jan 2024 14:37:15 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/loanbepadsincereapply/LoanBePadsincereExportVo.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereExportVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereExportVo.java
index 6195dc2b08..f2e79f8864 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbepadsincereapply/LoanBePadsincereExportVo.java
+++ b/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")

From 3c023b2ab689e2c614c0048c46fe0d9dc5d98623 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 18 Jan 2024 15:41:32 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../loanbepadsincereapply/LoanBePadsincereApplyService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
index 360fb91841..30309cb356 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
+++ b/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());

From 61dfa290b612b255bdcadd1db3437d42e960b27f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 18 Jan 2024 17:28:22 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E8=A7=A3=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/remotedecontrol/remotedecontrol.vue      | 10 +++++-----
 .../src/views/remotedecontrol/remotedecontrolAdd.vue   |  6 +++---
 .../src/views/remotedecontrol/remotedecontrolInfo.vue  |  6 +++---
 .../yuanchengjiekongFlow/remotedecontrolDaiBan.vue     |  6 +++---
 .../yuanchengjiekongFlow/remotedecontrolEdit.vue       |  4 ++--
 .../yuanchengjiekongFlow/remotedecontrolYiBan.vue      |  4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrol.vue b/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrol.vue
index 4b310aec02..62c92add43 100644
--- a/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrol.vue
+++ b/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>
diff --git a/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrolAdd.vue b/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrolAdd.vue
index 05bee4f5ae..db4a67fdcf 100644
--- a/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrolAdd.vue
+++ b/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" />
diff --git a/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrolInfo.vue b/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrolInfo.vue
index c85e8c21aa..70cc4b6a7e 100644
--- a/anrui-riskcenter-ui/src/views/remotedecontrol/remotedecontrolInfo.vue
+++ b/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" />
diff --git a/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolDaiBan.vue
index a57488bf24..81a57910ce 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolDaiBan.vue
+++ b/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" />
diff --git a/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolEdit.vue
index 32b12fa6a5..ff6992c5a9 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolEdit.vue
+++ b/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"/>
diff --git a/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolYiBan.vue
index cb2c24877e..2b7c11d0c8 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/yuanchengjiekongFlow/remotedecontrolYiBan.vue
+++ b/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"/>

From 3045651caef150a0c82c7730d7236b93b953fab6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 18 Jan 2024 17:29:57 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E4=BA=A4=E5=9B=9E=E4=BA=8B=E5=89=8D=E6=8A=A5=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/returnreserve/returnreserve.vue      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/returnreserve/returnreserve.vue b/anrui-riskcenter-ui/src/views/returnreserve/returnreserve.vue
index 849678803e..bc7e961cb6 100644
--- a/anrui-riskcenter-ui/src/views/returnreserve/returnreserve.vue
+++ b/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>