Commit 6b0bcf53 authored by yanzg's avatar yanzg

EXCEL自定义列处理

parent 41cb7e4e
...@@ -380,7 +380,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> { ...@@ -380,7 +380,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
for (ExportColumn column : this.config.getColumns()) { for (ExportColumn column : this.config.getColumns()) {
String columnName = column.getName(); String columnName = column.getName();
Object columnValue = rowHandle.get(t, columnName); Object columnValue = rowHandle.get(t, columnName);
String value = StringHelper.getFirst(String.valueOf(columnValue)); String value = StringHelper.getFirst(StringHelper.toString(columnValue));
// 合并組数据处理 // 合并組数据处理
if (column.isMerger()) { if (column.isMerger()) {
sb.append(value.replace(":", "::")); sb.append(value.replace(":", "::"));
...@@ -586,7 +586,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> { ...@@ -586,7 +586,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
if (isNumber) { if (isNumber) {
cell.setCellValue(StringHelper.toDouble(content)); cell.setCellValue(StringHelper.toDouble(content));
} else { } else {
cell.setCellValue(content); cell.setCellValue(StringHelper.getFirst(content));
} }
cell.setCellStyle(cellStyle); cell.setCellStyle(cellStyle);
return cell; return cell;
......
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