Commit 7e9a4574 authored by yanzg's avatar yanzg

接口文档的支持

parent 3b6919a2
...@@ -243,16 +243,6 @@ public class ExcelConsole<T extends Object> implements DbRow<T> { ...@@ -243,16 +243,6 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
// 当前合并組中添加需要合并的列 // 当前合并組中添加需要合并的列
mergerGroup.get(group).add(column.getName()); mergerGroup.get(group).add(column.getName());
} }
// 合并数据配置
for (int columnPos = 0; columnPos < this.config.getColumns().size(); columnPos++) {
ExportColumn column = this.config.getColumns().get(columnPos);
if (column.getWidth() < 1) {
sheet.autoSizeColumn(columnPos, true);
} else {
sheet.setColumnWidth(columnPos, getUnit(column.getWidth()));
}
}
} }
/** /**
...@@ -344,6 +334,16 @@ public class ExcelConsole<T extends Object> implements DbRow<T> { ...@@ -344,6 +334,16 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
return this; return this;
} }
// 合并数据配置
for (int columnPos = 0; columnPos < this.config.getColumns().size(); columnPos++) {
ExportColumn column = this.config.getColumns().get(columnPos);
if (column.getWidth() < 1) {
sheet.autoSizeColumn(columnPos, true);
} else {
sheet.setColumnWidth(columnPos, getUnit(column.getWidth()));
}
}
try { try {
OutputStream out = new FileOutputStream(this.getFileName()); OutputStream out = new FileOutputStream(this.getFileName());
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment