From 80a310f54039fabd20aecc2677fe6bbc191f4a5c Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期一, 11 八月 2025 14:40:37 +0800
Subject: [PATCH] 报表数据源解析,报表解析-添加{@@}内可以写bean方法

---
 src/main/java/com/product/server/report/service/ChartPropertyConfigService.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
index 8e7a529..47bf821 100644
--- a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
+++ b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
@@ -114,8 +114,10 @@
                 //鍐嶆坊鍔犳暟鎹�
                 if(!BaseUtil.dataTableIsEmpty(attributeDataTable)){
                     for (int j = 0; j < attributeDataTable.getRows(); j++) {
-                       FieldSetEntity fieldSetEntity = attributeDataTable.getFieldSetEntity(j);
+                        FieldSetEntity fieldSetEntity = attributeDataTable.getFieldSetEntity(j);
                         fieldSetEntity.setValue("report_config_uuid", subChartsUuid);
+                        fieldSetEntity.setValue("`grouping`", fieldSetEntity.getString("grouping"));
+                        fieldSetEntity.remove("grouping");
                         String report_type_attr_value = fieldSetEntity.getString("report_type_attr_value");
                         if(!BaseUtil.strIsNull(report_type_attr_value) && report_type_attr_value.contains("{#") && report_type_attr_value.contains("#}")){
                             String field_name = report_type_attr_value.replace("{#", "").replace("#}", "");

--
Gitblit v1.9.2