From eaa14277532f80f93b5a7d07ee66fe4de3f7845a Mon Sep 17 00:00:00 2001 From: "583641232@qq.com" <583641232@qq.com> Date: Tue, 30 Jul 2024 00:10:19 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20rar=E6=B5=81=E6=B0=B4=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/entity/CITICBankStatementEntity.java | 1 + .../bankStatementAnalysis/helper/CITICDataAnalysisHelper.java | 2 +- .../inscloudtech/bankStatementAnalysis/helper/HelperUtil.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CITICBankStatementEntity.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CITICBankStatementEntity.java index 18de72d..01203bf 100644 --- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CITICBankStatementEntity.java +++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/domain/entity/CITICBankStatementEntity.java @@ -83,5 +83,6 @@ public class CITICBankStatementEntity { @ExcelIgnore private String sourceFile; + @ExcelIgnore private String caseId; } diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CITICDataAnalysisHelper.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CITICDataAnalysisHelper.java index c10d169..7f56b7a 100644 --- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CITICDataAnalysisHelper.java +++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/CITICDataAnalysisHelper.java @@ -22,6 +22,7 @@ import com.inscloudtech.bankStatementAnalysis.helper.HelperUtil; import com.inscloudtech.common.constant.Constants; import com.inscloudtech.common.exception.dc.AnalyzeDataFailedException; import com.inscloudtech.common.exception.dc.ImportDataFailedException; +import com.inscloudtech.common.exception.dc.StopReadException; import com.inscloudtech.common.exception.dc.TemplateNotFindException; import com.inscloudtech.common.utils.bean.BeanUtils; import com.inscloudtech.converter.ExcelStringToJavaBigDecimalConverter; @@ -131,7 +132,6 @@ public class CITICDataAnalysisHelper { if(AsposeUtil.getCell(cells, "交易时间") != null){ readBSV4(wb, file, cells, sheetNo); /**20240418新信用卡流水模板*/ -// readCreditCard(absolutePath,sheetNo,AsposeUtil.getCell(cells, "交易时间")); }else { /**20240428新流水模板*/ readCreditCard(absolutePath,sheetNo,tradeCell); diff --git a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/HelperUtil.java b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/HelperUtil.java index 92dfceb..7aaab51 100644 --- a/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/HelperUtil.java +++ b/cas-system/src/main/java/com/inscloudtech/bankStatementAnalysis/helper/HelperUtil.java @@ -23,6 +23,7 @@ import com.inscloudtech.bankStatementAnalysis.helper.EsMapperHolder; import com.inscloudtech.bankStatementAnalysis.util.AnalyzeFileHelper; import com.inscloudtech.common.constant.Constants; import com.inscloudtech.common.exception.dc.GetIndexNameFailedException; +import com.inscloudtech.common.exception.dc.StopReadException; import com.inscloudtech.common.utils.JsonUtils; import com.inscloudtech.datacenter.domain.BankStatement; import com.inscloudtech.datacenter.domain.PlateNumberInfo; @@ -390,7 +391,7 @@ public class HelperUtil { startRow++; if (startRow >= endRow) { save(); - return; + throw new ExcelAnalysisStopException("不需要往下读"); } return; }