From cb4df5a1c9cda76e828fa202990df33be0735105 Mon Sep 17 00:00:00 2001 From: 许鹏程 <1821349743@qq.com> Date: 星期四, 29 六月 2023 09:32:34 +0800 Subject: [PATCH] poi、easyexcel、poi-tl升级 ,合并空调中的报表、数据源模块 --- src/main/java/com/product/server/report/entity/ReportColumn.java | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/product/server/report/entity/ReportColumn.java b/src/main/java/com/product/server/report/entity/ReportColumn.java index 94e1471..b904b74 100644 --- a/src/main/java/com/product/server/report/entity/ReportColumn.java +++ b/src/main/java/com/product/server/report/entity/ReportColumn.java @@ -13,9 +13,9 @@ */ public class ReportColumn { //璺ㄥ垪 - private int colspan = 1; + private String colspan = "1"; //璺ㄨ - private int rowspan = 1; + private String rowspan = "1"; //鍗曞厓鏍煎唴瀹� private String content; //绌块�忓瓧娈� @@ -31,14 +31,30 @@ private Map<String, String> otherParams = new HashMap<>(); + public ReportColumn() { + } + + public ReportColumn(String content) { + this.content = content; + } + + public ReportColumn(int colspan, int rowspan) { + this.colspan = String.valueOf(colspan); + this.rowspan = String.valueOf(rowspan); + } + + public ReportColumn(String content, int colspan, int rowspan) { + this.content = content; + this.colspan = String.valueOf(colspan); + this.rowspan = String.valueOf(rowspan); + } + public void replace(String key, String value) { if (!otherParams.isEmpty()) { Map<String, String> otherParams = this.otherParams; this.otherParams = new HashMap<>(); + otherParams.forEach((k, v) -> { - if ("rowspan".equals(v) && NumberUtil.isNumber(value) && k.equals(key)) { - this.rowspan = NumberUtil.parseInt(value); - } this.otherParams.put(k.replace(key, value), v.replace(key, value)); }); } @@ -51,28 +67,49 @@ if (!StringUtils.isEmpty(content)) { content = content.replace(key, value); } + if (key.equals(this.colspan)) { + this.colspan = value; + } + if (key.equals(this.rowspan)) { + this.rowspan = value; + } } public void addProperty(String key, String value) { otherParams.put(key, value); } - public int getColspan() { + public String getColspan() { return colspan; } public void setColspan(int colspan) { + this.colspan = String.valueOf(colspan); + } + + public void setColspan(String colspan) { this.colspan = colspan; } - public int getRowspan() { + public String getRowspan() { return rowspan; } - public void setRowspan(int rowspan) { + public int getRowspanInt() { + return NumberUtil.parseInt(rowspan); + } + public int getColspanInt() { + return NumberUtil.parseInt(colspan); + } + + public void setRowspan(String rowspan) { this.rowspan = rowspan; } + public void setRowspan(int rowspan) { + this.rowspan = String.valueOf(rowspan); + } + public String getContent() { return getContent(false); } -- Gitblit v1.9.2