|
@@ -233,6 +233,9 @@ public class ExcelUtil {
|
|
|
|
|
|
Element elementRow = rows.get(rowNum);
|
|
Element elementRow = rows.get(rowNum);
|
|
Elements cells = elementRow.select("td");
|
|
Elements cells = elementRow.select("td");
|
|
|
|
+ if (cells.size() == 0) {
|
|
|
|
+ cells = elementRow.select("th");
|
|
|
|
+ }
|
|
int cellSize = cells.size();
|
|
int cellSize = cells.size();
|
|
for (int cellNum = 0; cellNum < cellSize; cellNum++) {
|
|
for (int cellNum = 0; cellNum < cellSize; cellNum++) {
|
|
Cell sheetRowCell = sheetRow.createCell(cellNum);
|
|
Cell sheetRowCell = sheetRow.createCell(cellNum);
|
|
@@ -275,14 +278,15 @@ public class ExcelUtil {
|
|
}
|
|
}
|
|
return data;
|
|
return data;
|
|
}
|
|
}
|
|
- public static HSSFWorkbook getHSSFWorkbook(String sheetName, List<String> title, Map<String,List<List<String>>> valueMap, HSSFWorkbook wb) {
|
|
|
|
|
|
+
|
|
|
|
+ public static HSSFWorkbook getHSSFWorkbook(String sheetName, List<String> title, Map<String, List<List<String>>> valueMap, HSSFWorkbook wb) {
|
|
|
|
|
|
// 第一步,创建一个HSSFWorkbook,对应一个Excel文件
|
|
// 第一步,创建一个HSSFWorkbook,对应一个Excel文件
|
|
if (wb == null) {
|
|
if (wb == null) {
|
|
wb = new HSSFWorkbook();
|
|
wb = new HSSFWorkbook();
|
|
}
|
|
}
|
|
|
|
|
|
- try{
|
|
|
|
|
|
+ try {
|
|
// 第二步,在workbook中添加一个sheet,对应Excel文件中的sheet
|
|
// 第二步,在workbook中添加一个sheet,对应Excel文件中的sheet
|
|
HSSFSheet sheet = wb.createSheet(sheetName);
|
|
HSSFSheet sheet = wb.createSheet(sheetName);
|
|
// 第三步,在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制
|
|
// 第三步,在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制
|
|
@@ -314,8 +318,8 @@ public class ExcelUtil {
|
|
row.createCell(j).setCellValue(values.get(i).get(j));
|
|
row.createCell(j).setCellValue(values.get(i).get(j));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }catch (Exception e){
|
|
|
|
- logger.error(e.getMessage(),e);
|
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ logger.error(e.getMessage(), e);
|
|
}
|
|
}
|
|
return wb;
|
|
return wb;
|
|
}
|
|
}
|