From e82abf2a3a7a78034408a3f4b31bebf9d02871b8 Mon Sep 17 00:00:00 2001
From: "583641232@qq.com" <583641232@qq.com>
Date: Thu, 12 Sep 2024 18:11:19 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=20=20=E5=85=B4=E4=B8=9A=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E6=96=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/entity/CIBStatementEntity.java     | 20 +++++++++++--------
 .../helper/CCBDataAnalysisHelper.java         | 10 ++++++----
 .../helper/ICBCDataAnalysisHelper.java        |  6 +++---
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CIBStatementEntity.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CIBStatementEntity.java
index 15d2079..e50317b 100644
--- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CIBStatementEntity.java
+++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CIBStatementEntity.java
@@ -19,20 +19,23 @@ import org.dromara.easyes.annotation.rely.IdType;
 public class CIBStatementEntity {
 
     @IndexId(type = IdType.CUSTOMIZE)
+    @ExcelIgnore
     private String id;
 
     /**
      * 客户名称
      */
     @ExcelProperty("客户名称")
-    @IndexField(fieldType = FieldType.KEYWORD)
     private String cardHolderName;
 
     // 卡号
-    @ExcelProperty("账户代号")
-    @IndexField(fieldType = FieldType.KEYWORD)
+    @ExcelProperty({"账号","账户代号"})
     private String cardNumber;
 
+    // 卡号
+    @ExcelProperty("账号")
+    private String cardNumber2;
+
     // 交易日期
     @ExcelProperty("交易日期")
     private String transDate;
@@ -43,7 +46,7 @@ public class CIBStatementEntity {
     /**
      * 1为+，0为-
      */
-    @ExcelProperty("借贷标记")
+    @ExcelProperty({"借贷标记","借贷标志"})
     private String loanFlag;
 
     // 收入金额
@@ -55,21 +58,22 @@ public class CIBStatementEntity {
     private String balance;
 
     // 对方账号
-    @ExcelProperty("对方账户代号")
+    @ExcelProperty({"对方账户代号","对手账号"})
     private String counterpartyAccount;
 
-    @ExcelProperty("对方客户名称")
+    @ExcelProperty({"对方客户名称","对手户名"})
     private String counterpartyName;
 
-    @ExcelProperty("对方行名")
+    @ExcelProperty({"对方行名","对手开户行"})
     private String counterpartyBankName;
 
-    @ExcelProperty("摘要说明")
+    @ExcelProperty({"摘要说明","摘要描述"})
     private String summary;
 
     @ExcelProperty("用途")
     private String transRemark;
 
+    @ExcelIgnore
     private String caseId;
 
     @ExcelIgnore
diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CCBDataAnalysisHelper.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CCBDataAnalysisHelper.java
index 7fedd4f..2616c6d 100644
--- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CCBDataAnalysisHelper.java
+++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CCBDataAnalysisHelper.java
@@ -649,8 +649,11 @@ public class CCBDataAnalysisHelper {
             Cells cells = ws.getCells();
             String ssss = sourceFile + BankStatementConstants.NAME_WITH_SHEET_NAME + sheetName;
             try {
-
-                if (AsposeUtil.getCell(cells, "个人账户信息") != null) {
+                if (AsposeUtil.getCell(cells, "有无查询结果") != null) {
+                    continue;
+                }else if (AsposeUtil.getCell(cells, "查询无数据") != null) {
+                    continue;
+                } else if (AsposeUtil.getCell(cells, "个人账户信息") != null) {
                     // 读取账户信息
                     readAccountInfo(excelFile, cells, sheetNo, ssss);
                 } else if (AsposeUtil.getCell(cells, "个人活期明细信息") != null) {
@@ -680,11 +683,10 @@ public class CCBDataAnalysisHelper {
                     }
                 } else if (AsposeUtil.getCell(cells, "错误原因") != null) {
                    continue;
-                }else if (AsposeUtil.getCell(cells, "有无查询结果") != null) {
-                    continue;
                 }else  {
                    throw new TemplateNotFindException(ssss);
                 }
+
             } catch (Exception e) {
                 importResultService.record(caseId, BANK_NAME, e,ssss);
             }
diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/ICBCDataAnalysisHelper.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/ICBCDataAnalysisHelper.java
index fded23d..2a54503 100644
--- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/ICBCDataAnalysisHelper.java
+++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/ICBCDataAnalysisHelper.java
@@ -152,9 +152,9 @@ public class ICBCDataAnalysisHelper {
             if(stringValue.equals("入帐日期")){
                 int startRow = dateCell.getRow();
                 Cell cardHolderNameCell = cells.get(startRow - 1, 1);
-                if(null == cardHolderNameCell || StrUtil.isEmpty(cardHolderNameCell.getStringValue())){
-                    throw new ImportDataFailedException("读取持卡人信息异常", sourceFile);
-                }
+//                if(null == cardHolderNameCell || StrUtil.isEmpty(cardHolderNameCell.getStringValue())){
+//                    throw new ImportDataFailedException("读取持卡人信息异常", sourceFile);
+//                }
                 String cardHolderName = cardHolderNameCell.getStringValue().trim();
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.putOnce("startRow",i);