Commit 484295d0 authored by hongguangwu's avatar hongguangwu

1.7.21-优化校验

parent f9a9e04d
......@@ -342,19 +342,49 @@ public class ExcelUtil <T> implements Serializable {
field.set(data, c);
} else if (BigDecimal.class == fieldType) {
c = c.indexOf('%') != -1 ? c.replace("%", "") : c;
try {
field.set(data, BigDecimal.valueOf(Double.valueOf(c)));
} catch (NumberFormatException e) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap,
new ErrorMessage(rowNum, attr.name() + ":'" + c + "'不是有效的数字格式"), errorTemp);
continue;
}
} else if (Date.class == fieldType && Common.isNotNull(c.trim())) {
field.set(data, DateUtil.parseDate(c.trim(), Common.isEmpty(attr.dateFormat()) ? DateUtil.ISO_EXPANDED_DATE_FORMAT : attr.dateFormat()));
} else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType)) {
try {
field.set(data, Integer.parseInt(c));
} catch (NumberFormatException e) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap,
new ErrorMessage(rowNum, attr.name() + ":'" + c + "'不是有效的整数格式"), errorTemp);
continue;
}
} else if ((Long.TYPE == fieldType) || (Long.class == fieldType)) {
try {
field.set(data, Long.valueOf(c));
} catch (NumberFormatException e) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap,
new ErrorMessage(rowNum, attr.name() + ":'" + c + "'不是有效的长整数格式"), errorTemp);
continue;
}
} else if ((Float.TYPE == fieldType) || (Float.class == fieldType)) {
try {
field.set(data, Float.valueOf(c));
} catch (NumberFormatException e) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap,
new ErrorMessage(rowNum, attr.name() + ":'" + c + "'不是有效的浮点数格式"), errorTemp);
continue;
}
} else if ((Short.TYPE == fieldType) || (Short.class == fieldType)) {
field.set(data, Short.valueOf(c));
} else if ((Double.TYPE == fieldType) || (Double.class == fieldType)) {
try {
field.set(data, Double.valueOf(c));
} catch (NumberFormatException e) {
errorMessageHashMap = initErrorMessage(errorMessageHashMap,
new ErrorMessage(rowNum, attr.name() + ":'" + c + "'不是有效的双精度浮点数格式"), errorTemp);
continue;
}
} else if (Character.TYPE == fieldType) {
if ((c != null) && (c.length() > 0)) {
field.set(data, Character.valueOf(c.charAt(0)));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment