|
@@ -1,5 +1,6 @@
|
|
|
package com.fdkankan.manage.util;
|
|
|
|
|
|
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
import org.apache.poi.ss.usermodel.*;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
|
|
@@ -7,7 +8,9 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
|
|
@@ -30,10 +33,19 @@ public class ExcelUtil {
|
|
|
//转换为List数组
|
|
|
for (int cellNum=0;cellNum<= row.getLastCellNum();cellNum++){
|
|
|
Cell cell = row.getCell(cellNum);
|
|
|
+ if (cell != null && cell.getCellTypeEnum() != CellType.STRING && HSSFDateUtil.isCellDateFormatted(cell))
|
|
|
+ {
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ Date date = HSSFDateUtil.getJavaDate(cell.getNumericCellValue());
|
|
|
+ String value = sdf.format(date);
|
|
|
+ map.put(cellNum,value);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
if(cell != null){
|
|
|
String value = fommartNum(cell.toString().trim());
|
|
|
map.put(cellNum,value);
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
rowList.add(map);
|
|
|
}
|