From ae40b69e915dfb5e50ad801e2bfaf51573d8dd34 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Sun, 28 Apr 2024 08:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DownExcelOverdueBankVo.java               |  4 ++--
 .../api/loanoverduebank/ExcelBankVo.java      |  4 ++--
 .../LoanOverdueBankService.java               | 19 ++++++++++---------
 .../asbusrepairbill/AsBusrepairBillRest.java  |  5 +++++
 .../AsBusrepairBillService.java               |  1 +
 5 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/DownExcelOverdueBankVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/DownExcelOverdueBankVo.java
index 1e7b151f22..a3354fd1a2 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/DownExcelOverdueBankVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/DownExcelOverdueBankVo.java
@@ -14,8 +14,8 @@ public class DownExcelOverdueBankVo {
 
     @ExportEntityMap(CnName = "资方合同编号", EnName = "bankContractNo")
     private String bankContractNo;
-    @ExportEntityMap(CnName = "期数", EnName = "period")
-    private String period;
+   /* @ExportEntityMap(CnName = "期数", EnName = "period")
+    private String period;*/
     @ExportEntityMap(CnName = "资方逾期月还", EnName = "bankOverdueMoney")
     private String bankOverdueMoney;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/ExcelBankVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/ExcelBankVo.java
index 0cfbc3c7c3..b7954a54a5 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/ExcelBankVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/ExcelBankVo.java
@@ -14,8 +14,8 @@ public class ExcelBankVo {
 
     @ApiModelProperty("资方合同编号")
     private String bankContractNo;
-    @ApiModelProperty("期数")
-    private String period;
+  /*  @ApiModelProperty("期数")
+    private String period;*/
     @ApiModelProperty("资方逾期月还")
     private String bankOverdueMoney;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java
index 3c445bf469..00d12114f2 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java
@@ -691,7 +691,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
             return rb.fail().setMsg("上传文件不正确");
         }
-        int[] resultCell = new int[]{0, 1, 2};
+        int[] resultCell = new int[]{0, 1};
         List<ExcelBankVo> list = new ArrayList<>();
         List<ExcelBankVo> list2 = new ArrayList<>();
         boolean isExcel2003 = true;
@@ -741,10 +741,10 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
                                 case 0:
                                     excelBankVo.setBankContractNo(temp);
                                     break;
-                                case 1:
+                               /* case 1:
                                     excelBankVo.setPeriod(temp);
-                                    break;
-                                case 2:
+                                    break;*/
+                                case 1:
                                     excelBankVo.setBankOverdueMoney(temp);
                                     break;
                                 default:
@@ -762,10 +762,10 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
                             case 0:
                                 word = "资方合同编号";
                                 break;
-                            case 1:
+                           /* case 1:
                                 word = "期数";
-                                break;
-                            case 2:
+                                break;*/
+                            case 1:
                                 word = "资方逾期月还";
                                 break;
                             default:
@@ -785,9 +785,9 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
                 if (StringUtils.isBlank(excelBankVo.getBankContractNo())) {
                     checkWord.add("资方合同编号不能为空");
                 }
-                if (StringUtils.isBlank(excelBankVo.getPeriod())) {
+                /*if (StringUtils.isBlank(excelBankVo.getPeriod())) {
                     checkWord.add("期数不能为空");
-                }
+                }*/
                 if (StringUtils.isBlank(excelBankVo.getBankOverdueMoney())) {
                     checkWord.add("资方逾期月还不能为空，若无则需填写0");
                 }
@@ -816,6 +816,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
             returnExcelBankVo.setInfos(new ArrayList<>());
             return returnExcelBankVo;
         }
+
         returnExcelBankVo.setInfos(importVoList);
         return returnExcelBankVo;
     }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
index 1facc4cc32..2a0926f39f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
@@ -77,6 +77,11 @@ public class AsBusrepairBillRest {
         return rb.success();
     }
 
+    /**
+     * 旧件回收登记分页列表
+     * @param pagerQuery
+     * @return
+     */
     @PostMapping("/pageBillList")
     @ApiOperation("旧件回收登记分页列表")
     ResultBean<PagerVo<AsBusrepairPageVo>> pageBillList(@RequestBody PagerQuery<AsBusrepairPageQuery> pagerQuery){
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index da5177120c..bc593e2697 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -471,6 +471,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     }
 
     public PagerVo<AsBusrepairPageVo> pageBillList(PagerQuery<AsBusrepairPageQuery> pagerQuery) {
+
         return null;
     }