From c9f9728667c47848cc8c5125800b6ff6f0a0ef29 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Fri, 13 Aug 2021 17:37:21 +0800 Subject: [PATCH] Users import fix --- .../maxkey/persistence/service/UserInfoService.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java index fc3f58f1c..29f84aaf6 100644 --- a/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java +++ b/maxkey-persistence/src/main/java/org/maxkey/persistence/service/UserInfoService.java @@ -20,6 +20,8 @@ package org.maxkey.persistence.service; import java.io.IOException; import java.io.InputStream; +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; @@ -638,13 +640,19 @@ public class UserInfoService extends JpaBaseService { * @return */ public static String getValue(Cell cell) { + if (cell == null) { return ""; } else if (cell.getCellType() == CellType.BOOLEAN) { return String.valueOf(cell.getBooleanCellValue()); } else if (cell.getCellType() == CellType.NUMERIC) { - cell.setBlank(); - return String.valueOf(cell.getStringCellValue().trim()); + if("General".equals(cell.getCellStyle().getDataFormatString())){ + return new DecimalFormat("0").format(cell.getNumericCellValue()); + }else if("m/d/yy".equals(cell.getCellStyle().getDataFormatString())){ + return new SimpleDateFormat("yyyy-MM-dd").format(cell.getDateCellValue()); + }else{ + return new DecimalFormat("0").format(cell.getNumericCellValue()); + } } else { return String.valueOf(cell.getStringCellValue().trim()); }