导出excel修复
This commit is contained in:
parent
7793636288
commit
8428a44461
|
|
@ -308,25 +308,20 @@ public class ExportDeviceHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
List<ImportExcelField> items = new ArrayList<>();
|
List<ImportExcelField> items = new ArrayList<>();
|
||||||
for (OptionalEbomImportVO item1 : listTable) {
|
String opParentName="";
|
||||||
String opParentName = item1.getOptionName();
|
String optionParentDrawingNoName="";
|
||||||
String optionParentDrawingNoName = item1.getOptionDrawingNo();
|
|
||||||
List<OptionalEbomImportVO> list2 = item1.getChild();
|
for ( int row =0;row< listTable.size();row++ ) {
|
||||||
List<String> cellList = new ArrayList<>();
|
|
||||||
cellList.add(opParentName);
|
OptionalEbomImportVO item1=listTable.get(row);
|
||||||
|
opParentName = item1.getOptionName();
|
||||||
|
optionParentDrawingNoName = item1.getOptionDrawingNo();
|
||||||
|
|
||||||
|
List<OptionalEbomImportVO> list2 = item1.getChild();
|
||||||
|
// List<String> cellList = new ArrayList<>();
|
||||||
|
// cellList.add(opParentName);
|
||||||
|
|
||||||
|
|
||||||
if (CollectionUtil.isNotEmpty(items)) {
|
|
||||||
tableNoCounting.getAndIncrement();
|
|
||||||
WriteTable table = EasyExcel.writerTable(tableNoCounting.get())
|
|
||||||
.head(getHeader(opParentName))
|
|
||||||
.needHead(Boolean.TRUE)//需要Header
|
|
||||||
.registerWriteHandler(EasyExcelUtil.getDefaultStyle())//传入自定义样式
|
|
||||||
.registerWriteHandler(new HeaderStyleCustomCellWriteHandler())
|
|
||||||
.registerWriteHandler(new ColumnMergeStrategy(0, new int[]{0, 1}))
|
|
||||||
.build();
|
|
||||||
writer.write(items, sheet, table);
|
|
||||||
items.clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
for (OptionalEbomImportVO item2 : list2) {
|
for (OptionalEbomImportVO item2 : list2) {
|
||||||
|
|
@ -344,6 +339,25 @@ public class ExportDeviceHelper {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if (CollectionUtil.isNotEmpty(items)) {
|
||||||
|
tableNoCounting.getAndIncrement();
|
||||||
|
WriteTable table = EasyExcel.writerTable(tableNoCounting.get())
|
||||||
|
.head(getHeader(opParentName))
|
||||||
|
.needHead(Boolean.TRUE)//需要Header
|
||||||
|
.registerWriteHandler(EasyExcelUtil.getDefaultStyle())//传入自定义样式
|
||||||
|
.registerWriteHandler(new HeaderStyleCustomCellWriteHandler())
|
||||||
|
.registerWriteHandler(new ColumnMergeStrategy(0, new int[]{0, 1}))
|
||||||
|
.build();
|
||||||
|
writer.write(items, sheet, table);
|
||||||
|
items.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue