diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CGSBankStatement.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CGSBankStatement.java index ab312ea..f7eef62 100644 --- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CGSBankStatement.java +++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CGSBankStatement.java @@ -24,6 +24,9 @@ public class CGSBankStatement { @ExcelProperty("id") private String id; + @ExcelProperty(value = "名称") + private String cardHolderName; + @ExcelProperty("银行") @IndexField(fieldType = FieldType.KEYWORD) private String bankName; @@ -32,6 +35,8 @@ public class CGSBankStatement { @IndexField(fieldType = FieldType.KEYWORD) private String cardNumber; + + @ExcelProperty("借贷标志") private String creditMark; diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CGSAnalysisHelper.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CGSAnalysisHelper.java index 17c278f..39ed17c 100644 --- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CGSAnalysisHelper.java +++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CGSAnalysisHelper.java @@ -94,6 +94,9 @@ public class CGSAnalysisHelper { getBaseInfo(wb,sheetNo,excelFileName,baseInfoList); } else if(worksheetName.equals("账户基本信息")){ saveOpenInfo(wb,sheetNo,excelFileName,baseInfoList,bankName); + } else if(worksheetName.equals("查询反馈结果") || worksheetName.equals("强制措施信息") + || worksheetName.equals("账户共有权信息")|| worksheetName.equals("关联子账户信息")){ + continue; }else { throw new TemplateNotFindException(sourceFile + BankStatementConstants.NAME_WITH_SHEET_NAME+ worksheetName); } @@ -186,7 +189,7 @@ public class CGSAnalysisHelper { accountInfo.setCardHolderName(baseInfo.getCardHolderName()); accountInfo.setPhone(baseInfo.getPhone()); accountInfo.setAddress(baseInfo.getAddress()); - accountInfo.setBankName(BANK_NAME); + accountInfo.setBankName(bankName); } if(accountInfo.getCardHolderName() == null){ excelFileName.length(); @@ -267,7 +270,7 @@ public class CGSAnalysisHelper { throw new AnalyzeDataFailedException( String.format("解析交易时间错误,无法将【%s】格式化为【%s】", transTime, format), e); } - data.setBankName(BANK_NAME); + data.setBankName(bankName); data.setId(IdUtil.objectId()); bsList.add(data); } @@ -368,13 +371,17 @@ public class CGSAnalysisHelper { BankStatement bs = new BankStatement(); bs.setBankName(entity.getBankName()); + bs.setCardHolderName(entity.getCardHolderName()); if (groupByCardNumber.containsKey(cardNumber)) { List abcCustomerInfoEntities = groupByCardNumber.get(cardNumber); OpeningAccountInfo oai = abcCustomerInfoEntities.get(0); bs.setIdCardNo(oai.getIdNo()); - bs.setCardHolderName(oai.getName()); + if(StrUtil.isNotEmpty(oai.getName())){ + bs.setCardHolderName(oai.getName()); + } bs.setPhone(oai.getPhone()); } + bs.setCardNumber(cardNumber); // 4 交易时间 String transTime = entity.getTransTime();