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/service/CommonReportService.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/product/server/report/service/CommonReportService.java b/src/main/java/com/product/server/report/service/CommonReportService.java
index f239244..d5a3ac0 100644
--- a/src/main/java/com/product/server/report/service/CommonReportService.java
+++ b/src/main/java/com/product/server/report/service/CommonReportService.java
@@ -40,7 +40,6 @@
* @param recordDte 涓氬姟鏁版嵁dte
* @param totalStatisticsFlag 鏄惁鍚堣鏍囪瘑
* @param reportConfigMap 鎶ヨ〃閰嶇疆缂撳瓨map
- * @param tableStyle
* @return
*/
public ReportEntity getReportEntity(DataTableEntity recordDte, String totalName, Map<Integer, List<JSONObject>> reportConfigMap) {
@@ -64,7 +63,9 @@
if (!CollectionUtil.isEmpty(headTitleRows)) {
List<List<ReportColumn>> reportHeader = report.getReportHeader();
- headTitleRows.addAll(reportHeader);
+ if (reportHeader != null) {
+ headTitleRows.addAll(reportHeader);
+ }
report.setReportHeader(headTitleRows);
}
if (!CollectionUtil.isEmpty(tailTitleRows)) {
@@ -298,7 +299,11 @@
}
}
paramKey = dataListReportService.concat(keyObj, CmnConst.ATTR_ROWSPAN);
- column.setRowspan(NumberUtil.parseInt(paramKey));
+ if (NumberUtil.isNumber(paramKey)) {
+ column.setRowspan(NumberUtil.parseInt(paramKey));
+ } else {
+ column.addProperty(paramKey, "rowspan");
+ }
replaceMap.put(paramKey, "1");
}
// class
@@ -349,13 +354,14 @@
if (!StringUtils.isEmpty(totalName)) {
reportData.add(getDataAreaTotalStatistics(statisticsMap, dataAreaFieldConfigMap, dataAreaGroupFieldNameList, preFse, dataAreaGroupFieldRecordObj, totalName));
}
- for (Map.Entry<String, String> entry : replaceMap.entrySet()) {
- reportData.stream().forEach(item -> {
- item.stream().forEach(column -> {
+ reportData.stream().forEach(item -> {
+ item.stream().forEach(column -> {
+ for (Map.Entry<String, String> entry : replaceMap.entrySet()) {
column.replace(entry.getKey(), entry.getValue());
- });
+ }
});
- }
+ });
+
return reportData;
}
--
Gitblit v1.9.2