|
@@ -713,6 +713,19 @@ public class WbsTreeContractController extends BladeController {
|
|
|
WorksheetsCollection worksheets = workbook.getWorksheets();
|
|
|
workbook.saveToFile(importExcelTOHtmlPath, FileFormat.HTML);
|
|
|
int size = worksheets.size();
|
|
|
+
|
|
|
+ //获取第一张表的行和列,然后其他表与第一张表的行、列不匹配,就说明表格错误
|
|
|
+ Worksheet worksheet = worksheets.get(0);
|
|
|
+ int lastRow = worksheet.getLastRow();
|
|
|
+ int lastColumn = worksheet.getLastColumn();
|
|
|
+ //排除空表
|
|
|
+ for (int x = 0; x < size; x++) {
|
|
|
+ Worksheet sheet = worksheets.get(x);
|
|
|
+ if(lastRow != sheet.getLastRow() && lastColumn != sheet.getLastColumn()){
|
|
|
+ worksheets.remove(x);
|
|
|
+ size = worksheets.size();
|
|
|
+ }
|
|
|
+ }
|
|
|
//如果sheet比数据库中表多 则需要添加复制表
|
|
|
if (size > list.size()) {
|
|
|
//却几张复制几张 并且复制出来的排序要再最后
|