From 3b6b2e8d625b3d9dfc1a819b52e23da1a493506e Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期四, 06 十一月 2025 10:23:17 +0800
Subject: [PATCH] 图标配置优化
---
src/main/java/com/product/server/report/service/ChartPropertyConfigService.java | 2 +-
src/main/java/com/product/server/report/service/GenerateEChartService.java | 25 +++++++++++++++++--------
2 files changed, 18 insertions(+), 9 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 930b463..de37807 100644
--- a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
+++ b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
@@ -299,7 +299,7 @@
sql.append("\n c.uuid cuuid,c.detail cdetail,c.attribute_name cname,c.subordinate_element_type csubordinate_element_type,c.is_commonly cis_commonly, ");
sql.append("\n d.uuid duuid,d.detail ddetail,d.attribute_name dname,d.subordinate_element_type dsubordinate_element_type,d.is_commonly dis_commonly, ");
sql.append("\n e.uuid euuid,e.detail edetail,e.attribute_name ename,e.subordinate_element_type esubordinate_element_type,e.is_commonly eis_commonly, ");
- sql.append("\n f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinate_element_type fsubordinate_element_type,f.is_commonly fis_commonly, ");
+ sql.append("\n f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinate_element_type fsubordinate_element_type,f.is_commonly fis_commonly ");
sql.append("\nFROM product_sys_report_type_attribute a ");
sql.append("\nLEFT JOIN product_sys_report_type_attribute b on a.parent_attribute_uuid = b.uuid ");
sql.append("\nLEFT JOIN product_sys_report_type_attribute c on b.parent_attribute_uuid = c.uuid ");
diff --git a/src/main/java/com/product/server/report/service/GenerateEChartService.java b/src/main/java/com/product/server/report/service/GenerateEChartService.java
index a462e17..a20b9ce 100644
--- a/src/main/java/com/product/server/report/service/GenerateEChartService.java
+++ b/src/main/java/com/product/server/report/service/GenerateEChartService.java
@@ -117,9 +117,6 @@
sql.append("WHERE a.report_config_uuid = ? \n");
sql.append("ORDER BY a.group_sign,b.parent_attribute_uuid");
DataTableEntity attributeData = baseDao.listTable(sql.toString() ,new Object[]{fse.getString(CmnConst.UUID)});
- if ("13081b93-bd02-4319-a423-e3000cd9e9b4".equals(fse.getUUID())) {
- System.out.println("");
- }
// 鍒涘缓鍥捐〃灞炴�у鍣�
JSONObject allProperties = new JSONObject();
if(!BaseUtil.dataTableIsEmpty(attributeData)){
@@ -130,9 +127,6 @@
FieldSetEntity fseAttr = attributeData.getFieldSetEntity(i);
// 鍥捐〃灞炴�у拰閰嶇疆鍊�
String attrName = fseAttr.getString(CmnConst.ATTRIBUTE_NAME);
- if("show".equals(attrName)) {
- System.out.println();
- }
String attrValue = fseAttr.getString(CmnConst.REPORT_TYPE_ATTR_VALUE);
if(BaseUtil.strIsNull(attrValue)){
// 閰嶇疆鍊间负绌哄垯鐢ㄩ粯璁ゅ��
@@ -330,7 +324,22 @@
if(theOriginalData == null){
currentProperty.put(attribute_name,arr);
}else {
- theOriginalData.add(arr.getJSONObject(arr.size()-1));
+ JSONObject lastJSONObject = theOriginalData.getJSONObject(theOriginalData.size() - 1);
+ JSONObject insertJsonObject = arr.getJSONObject(arr.size()-1);
+ for (String key : insertJsonObject.keySet()) {
+ if (lastJSONObject.containsKey(key)) {
+ // key宸插瓨鍦紝鏂板缓瀵硅薄
+ theOriginalData.add(insertJsonObject);
+ break;
+ } else {
+ // key涓嶅瓨鍦紝鍚堝苟
+ lastJSONObject.putAll(insertJsonObject);
+ break;
+ }
+ }
+// theOriginalData.getJSONObject(theOriginalData.size() - 1)
+// .putAll(JSONObject.parseObject(arr.getJSONObject(arr.size()-1).toJSONString()));
+// theOriginalData.add(arr.getJSONObject(arr.size()-1));
}
}else {
@@ -432,7 +441,7 @@
oArray[0] = subObj;
}
}else {
- oArray[0] = attr_value;
+ oArray[0] = SystemParamReplace.systemParamsReplace(attr_value);
}
return oArray;
}
--
Gitblit v1.9.2