Merge remote-tracking branch 'origin/master'

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

@@ -10,6 +10,14 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  listAll: function(params) {
+    return request({
+      url: '/riskcenter/v1/loanrepaymenthistory/repaymentStatisticsList',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 查询分页列表 -- 客户还款明细查询
   pageList: function(params) {
     return request({

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

@@ -78,8 +78,8 @@
         </div>
         <!--Start 主页面主要部分 -->
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries">
-            <el-table-column fixed type="selection" align="center" width="50"/>
+            <el-table-column fixed type="selection" align="center" width="60"/>
             <el-table-column fixed label="序号" type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column fixed prop="useOrgName" label="分公司" width="130" align="center" />
             <el-table-column fixed prop="dept" label="销售部门" width="130" align="center" />
@@ -92,17 +92,17 @@
             <el-table-column prop="borrowerName" label="贷款人" width="100" align="center" />
             <el-table-column prop="period" label="期数" min-width="100" align="center" />
             <el-table-column prop="dueDate" label="应还日期" width="100" align="center" />
-            <el-table-column prop="dueMoney" label="应还金额" width="100" align="center" />
+            <el-table-column prop="dueMoney" label="应还金额" width="120" align="center" />
-            <el-table-column prop="repaidMoney" label="已还金额" width="100" align="center" />
+            <el-table-column prop="repaidMoney" label="已还金额" width="120" align="center" />
-            <el-table-column prop="outstandingMoney" label="未还金额" width="100" align="center" />
+            <el-table-column prop="outstandingMoney" label="未还金额" width="120" align="center" />
             <el-table-column label="还款状态" width="100" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.returnState == '01' ? '未还' : scope.row.returnState == '02' ? '部分还款' : scope.row.returnState == '03' ? '已还款' : '' }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="paymentMoney" label="公司垫款余额" width="120" align="center" />
+            <el-table-column prop="paymentMoney" label="公司垫款余额" width="130" align="center" />
-            <el-table-column prop="bankBeInter" label="垫资方逾期利息余额" width="160" align="center" />
+            <el-table-column prop="bankBeInter" label="垫资方逾期利息余额" width="170" align="center" />
-            <el-table-column prop="fund" label="资金占用费余额" width="140" align="center" />
+            <el-table-column prop="fund" label="资金占用费余额" width="150" align="center" />
             <el-table-column label="当前是否逾期" width="120" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.nowOverdue == '0' ? '是' : scope.row.nowOverdue == '1' ? '否' : '' }}</span>
@@ -243,6 +243,7 @@ export default {
       viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
       tableKey: 0,
       list: [],
+      listAll: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
       returnState_list: [
         {
@@ -406,6 +407,13 @@ export default {
           this.listQuery.total = 0
         }
       })
+      req.listAll(this.listQuery.params).then((res) => {
+        if (res.success) {
+          this.listAll = res.data
+        } else {
+          this.listAll = []
+        }
+      })
     },
     // 查询按钮
     handleFilter() {
@@ -523,7 +531,7 @@ export default {
         const fileName = '客户月还还款情况表' + '.xls'
         const elink = document.createElement('a')
         elink.download = fileName
-        elink.style.display = 'nonde'
+        elink.style.display = 'none'
         elink.href = URL.createObjectURL(blob)
         document.body.appendChild(elink)
         elink.click()
@@ -533,6 +541,33 @@ export default {
         loading.close()
       })
     },
+    // 合计
+    getSummaries(param) {
+      param.data = this.listAll
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'dueMoney' || column.property === 'repaidMoney' || column.property === 'repaidMoney' || column.property === 'outstandingMoney' || column.property === 'paymentMoney' || column.property === 'bankBeInter' || column.property === 'fund') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
+            } else {
+              return Math.round((parseFloat(prev)) * 100) / 100
+            }
+          }, 0)
+          sums[index] += ''
+        } else {
+          sums[index] = ''
+        }
+      })
+      return sums
+    },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)

anrui-riskcenter-ui/src/views/overduereconciliationcapital/overduereconciliationcapitalAdd.vue

@@ -230,9 +230,18 @@ export default {
         if (this.upload_list.length > 0) {
           this.upload_list.forEach((e) => {
             this.formobj.detailsVoList.forEach((k) => {
+              // 当列表中资方合同编号与导入的资方合同编号一致时
               if (e.bankContractNo === k.bankContractNo) {
+                // 资方逾期月还取导入的值
                 k.bankOverdueMoney = e.bankOverdueMoney
-                k.diffMoney = parseFloat(k.overdueMoney) - parseFloat(k.bankOverdueMoney)
+                // 差异金额 = 平台逾期金额 - 资方逾期月还
+                k.diffMoney = Math.round((parseFloat(k.overdueMoney) - parseFloat(k.bankOverdueMoney)) * 100) / 100
+              } else {
+                // 当列表中的资方合同编号在导入的信息中找不到时
+                // 资方逾期月还赋值0
+                k.bankOverdueMoney = '0'
+                // 差异金额 = 平台逾期金额
+                k.diffMoney = k.overdueMoney
               }
             })
           })

anrui-riskcenter-ui/src/views/workFlow/caiwuduizhangFlow/caiwuduizhangByExport.vue

@@ -326,10 +326,19 @@ export default {
       } else {
         if (this.upload_list.length > 0) {
           this.upload_list.forEach((e) => {
+            // 当列表中车架号与导入的车架号一致时
             this.formobj.detailsVoList.forEach((k) => {
               if (e.vinNo === k.vinNo) {
+                // 资方逾期月还取导入的值
                 k.tiredDeficiency = e.tiredDeficiency
+                // 差异金额 = 平台逾期金额 - 财务累欠金额
                 k.diffMoney = parseFloat(k.overdueMoney) - parseFloat(k.tiredDeficiency)
+              } else {
+                // 当列表中的车架号在导入的信息中找不到时
+                // 资方逾期月还赋值0
+                k.tiredDeficiency = '0'
+                // 差异金额 = 平台逾期金额
+                k.diffMoney = k.overdueMoney
               }
             })
           })

anrui-riskcenter-ui/src/views/workFlow/zifangduizhangFlow/zifangduizhangEdit.vue

@@ -235,9 +235,18 @@ export default {
         if (this.upload_list.length > 0) {
           this.upload_list.forEach((e) => {
             this.formobj.detailsVoList.forEach((k) => {
+              // 当列表中资方合同编号与导入的资方合同编号一致时
               if (e.bankContractNo === k.bankContractNo) {
-                k.tiredDeficiency = e.bankOverdueMoney
+                // 资方逾期月还取导入的值
-                k.diffMoney = parseFloat(k.overdueMoney) - parseFloat(k.tiredDeficiency)
+                k.bankOverdueMoney = e.bankOverdueMoney
+                // 差异金额 = 平台逾期金额 - 资方逾期月还
+                k.diffMoney = Math.round((parseFloat(k.overdueMoney) - parseFloat(k.bankOverdueMoney)) * 100) / 100
+              } else {
+                // 当列表中的资方合同编号在导入的信息中找不到时
+                // 资方逾期月还赋值0
+                k.bankOverdueMoney = '0'
+                // 差异金额 = 平台逾期金额
+                k.diffMoney = k.overdueMoney
               }
             })
           })

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java

@@ -738,18 +738,18 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
         Sheet sheet = wb.getSheetAt(0);
         ReturnExcelFinVo importReturn = getSheetVal(sheet, resultCell, useOrgSid);
         list = importReturn.getInfos();
-        for (ExcelFinVo excelFinVo : list) {
+        /*for (ExcelFinVo excelFinVo : list) {
             String customerName = excelFinVo.getCustomerName();
             if (customerName.contains(excelFinVo.getVinNo().substring(0, excelFinVo.getVinNo().length() - 8))) {
                 customerName = customerName.substring(0, customerName.length() - 8);
                 excelFinVo.setCustomerName(customerName);
             }
             list2.add(excelFinVo);
-        }
+        }*/
         if (StringUtils.isNotBlank(importReturn.getCheckInfo())) {
             return rb.setMsg(importReturn.getCheckInfo());
         } else {
-            return rb.success().setData(list2).setMsg("成功导入数据，请点击确定按钮");
+            return rb.success().setData(list).setMsg("成功导入数据，请点击确定按钮");
         }
     }