From 1156a6e9619864201de922f4cfa93f6db989ff2e Mon Sep 17 00:00:00 2001
From: 1821349743@qq.com <1821349743@qq.com>
Date: 星期一, 17 四月 2023 12:09:07 +0800
Subject: [PATCH] report update
---
src/main/java/com/product/server/report/entity/ReportColumn.java | 26 ++++++++++++++++++--------
1 files changed, 18 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 8af08fc..94e1471 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
@@ -36,17 +36,20 @@
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));
});
}
- 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);
}
}
@@ -71,7 +74,14 @@
}
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