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 |   73 ++++++++++++++++++++++++++++++------
 1 files changed, 60 insertions(+), 13 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 8af08fc..b904b74 100644
--- a/src/main/java/com/product/server/report/entity/ReportColumn.java
+++ b/src/main/java/com/product/server/report/entity/ReportColumn.java
@@ -1,10 +1,10 @@
 package com.product.server.report.entity;
 
+import cn.hutool.core.util.NumberUtil;
 import com.product.common.lang.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @Author cheng
@@ -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,22 +31,47 @@
 
 	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) -> {
 				this.otherParams.put(k.replace(key, value), v.replace(key, value));
 			});
 		}
-		if(!StringUtils.isEmpty(subReportProperty)){
-			subReportProperty=subReportProperty.replace(key,value);
+		if (!StringUtils.isEmpty(subReportProperty)) {
+			subReportProperty = subReportProperty.replace(key, value);
 		}
-		if(!StringUtils.isEmpty(penetrateProperty)){
-			penetrateProperty=penetrateProperty.replace(key,value);
+		if (!StringUtils.isEmpty(penetrateProperty)) {
+			penetrateProperty = penetrateProperty.replace(key, value);
 		}
-		if(!StringUtils.isEmpty(content)){
-			content=content.replace(key,value);
+		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;
 		}
 	}
 
@@ -54,24 +79,46 @@
 		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 content;
+		return getContent(false);
+	}
+
+	public String getContent(boolean emptyChar) {
+		if (emptyChar) {
+			return this.content == null ? "" : this.content;
+		}
+		return this.content;
 	}
 
 	public void setContent(String content) {

--
Gitblit v1.9.2