|
|
@@ -18,7 +18,6 @@ import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFCell;
|
|
|
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFRow;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFSheet;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
@@ -112,15 +111,7 @@ public class ExcelUtil {
|
|
|
value = cell.getStringCellValue();
|
|
|
break;
|
|
|
case NUMERIC:
|
|
|
- if ("@".equals(cell.getCellStyle().getDataFormatString())) {
|
|
|
- value = df.format(cell.getNumericCellValue());
|
|
|
- } else if ("General".equals(cell.getCellStyle()
|
|
|
- .getDataFormatString())) {
|
|
|
- value = nf.format(cell.getNumericCellValue());
|
|
|
- } else {
|
|
|
- value = sdf.format(HSSFDateUtil.getJavaDate(cell
|
|
|
- .getNumericCellValue()));
|
|
|
- }
|
|
|
+ value = cell.getNumericCellValue();
|
|
|
break;
|
|
|
case BOOLEAN:
|
|
|
value = Boolean.valueOf(cell.getBooleanCellValue());
|
|
|
@@ -177,15 +168,7 @@ public class ExcelUtil {
|
|
|
value = cell.getStringCellValue();
|
|
|
break;
|
|
|
case NUMERIC:
|
|
|
- if ("@".equals(cell.getCellStyle().getDataFormatString())) {
|
|
|
- value = df.format(cell.getNumericCellValue());
|
|
|
- } else if ("General".equals(cell.getCellStyle()
|
|
|
- .getDataFormatString())) {
|
|
|
- value = nf.format(cell.getNumericCellValue());
|
|
|
- } else {
|
|
|
- value = sdf.format(HSSFDateUtil.getJavaDate(cell
|
|
|
- .getNumericCellValue()));
|
|
|
- }
|
|
|
+ value = cell.getNumericCellValue();
|
|
|
break;
|
|
|
case BOOLEAN:
|
|
|
value = Boolean.valueOf(cell.getBooleanCellValue());
|
longht