From 6c0c3557e791dc46948190dd3745335ed043d051 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 17 九月 2025 09:30:32 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/server/report/service/ChartPropertyConfigService.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 dd02dbd..b9da905 100644
--- a/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
+++ b/src/main/java/com/product/server/report/service/ChartPropertyConfigService.java
@@ -230,7 +230,7 @@
JSONObject object = children.getJSONObject(i);
String grouping = object.getString("grouping");
JSONArray subChildren = object.getJSONArray("children");
- if ("1".equals(grouping) && "1".equals(jsonObject.getString("subordinateElementType"))) {
+ if ("1".equals(grouping) && "1".equals(jsonObject.getString(CmnConst.SUBORDINATE_ELEMENT_TYPE))) {
JSONObject group = new JSONObject();
group.put("children", JSONArray.parseArray(children.toJSONString()));
group.put("label", "缁勫悕");
@@ -294,18 +294,18 @@
*/
public DataTableEntity getEChartsElementList(String uuid)throws BaseException{
StringBuffer sql = new StringBuffer();
- sql.append(" SELECT a.uuid auuid,a.detail adetail,a.attribute_name aname,a.subordinateElementType asubordinateElementType,a.prompt_name,a.default_value, ")
- .append(" b.uuid buuid,b.detail bdetail,b.attribute_name bname,b.subordinateElementType bsubordinateElementType, ")
- .append(" c.uuid cuuid,c.detail cdetail,c.attribute_name cname,c.subordinateElementType csubordinateElementType, ")
- .append(" d.uuid duuid,d.detail ddetail,d.attribute_name dname,d.subordinateElementType dsubordinateElementType, ")
- .append(" e.uuid euuid,e.detail edetail,e.attribute_name ename,e.subordinateElementType esubordinateElementType, ")
- .append(" f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinateElementType fsubordinateElementType FROM ")
+ sql.append(" SELECT a.uuid auuid,a.detail adetail,a.attribute_name aname,a.subordinate_element_type asubordinateElementType,a.prompt_name,a.default_value, ")
+ .append(" b.uuid buuid,b.detail bdetail,b.attribute_name bname,b.subordinate_element_type bsubordinateElementType, ")
+ .append(" c.uuid cuuid,c.detail cdetail,c.attribute_name cname,c.subordinate_element_type csubordinateElementType, ")
+ .append(" d.uuid duuid,d.detail ddetail,d.attribute_name dname,d.subordinate_element_type dsubordinateElementType, ")
+ .append(" e.uuid euuid,e.detail edetail,e.attribute_name ename,e.subordinate_element_type esubordinateElementType, ")
+ .append(" f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinate_element_type fsubordinateElementType FROM ")
.append("product_sys_report_type_attribute a LEFT JOIN ")
- .append("product_sys_report_type_attribute b on a.parentAttributeUuid = b.uuid LEFT JOIN ")
- .append("product_sys_report_type_attribute c on b.parentAttributeUuid = c.uuid LEFT JOIN ")
- .append("product_sys_report_type_attribute d on c.parentAttributeUuid = d.uuid LEFT JOIN ")
- .append("product_sys_report_type_attribute e on d.parentAttributeUuid = e.uuid LEFT JOIN ")
- .append("product_sys_report_type_attribute f on e.parentAttributeUuid = f.uuid ")
+ .append("product_sys_report_type_attribute b on a.parent_attribute_uuid = b.uuid LEFT JOIN ")
+ .append("product_sys_report_type_attribute c on b.parent_attribute_uuid = c.uuid LEFT JOIN ")
+ .append("product_sys_report_type_attribute d on c.parent_attribute_uuid = d.uuid LEFT JOIN ")
+ .append("product_sys_report_type_attribute e on d.parent_attribute_uuid = e.uuid LEFT JOIN ")
+ .append("product_sys_report_type_attribute f on e.parent_attribute_uuid = f.uuid ")
.append(" WHERE a.config_properties = 1 ")
.append(" AND a.type_uuid = ? ");
--
Gitblit v1.9.2