From 8fd0ad7a95d85cd09c5bf98bc0c05235a162a8af Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 十一月 2023 16:40:34 +0800
Subject: [PATCH] bug列表：180(分类上增加关键属性查重校验字段当前分类是否参与校验，历史数据导入代码逻辑中关键属性校验增加过滤条件)
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
index 48bb7c8..2540662 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/poi/util/ExcelUtil.java
@@ -943,7 +943,7 @@
Map<Integer, String> rowDataMap = new HashMap();
- for(int columnIndex = 0; columnIndex < rowDataSet.getLastCellNum(); ++columnIndex) {
+ for(int columnIndex = 0; columnIndex < sheetDataSet.getColName().size(); ++columnIndex) {
Cell cell = rowDataSet.getCell(columnIndex);
Object value = getCellValue(cell, evaluator);
String title = colsNameIndexMap.containsKey(columnIndex) ? (String)colsNameIndexMap.get(columnIndex) : "";
@@ -1025,14 +1025,17 @@
} else {
rowDataMap.put(columnIndex, VciBaseUtil.getStringValueFromObject(value));
}
- } else if (!isDataSet && thisField != null && excelColumn != null) {
- if (!excelColumn.nullable()) {
- throw new VciBaseException("cellValueCanNotNull", new String[]{title, rowIndex + 1 + ""});
- }
+ } else {
+ if (!isDataSet && thisField != null && excelColumn != null) {
+ if (!excelColumn.nullable()) {
+ throw new VciBaseException("cellValueCanNotNull", new String[]{title, rowIndex + 1 + ""});
+ }
- if (StringUtil.isNotBlank(excelColumn.regExg())) {
- throw new VciBaseException("cellValueCanNotNullForReg", new String[]{title, rowIndex + 1 + ""});
+ if (StringUtil.isNotBlank(excelColumn.regExg())) {
+ throw new VciBaseException("cellValueCanNotNullForReg", new String[]{title, rowIndex + 1 + ""});
+ }
}
+ rowDataMap.put(columnIndex, VciBaseUtil.getStringValueFromObject(value));
}
}
--
Gitblit v1.9.3