product-server-report
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
shicf
2025-10-30 59b6be83d059757671de9a1653efcb9f5f8a16c8 
 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("#}", "");


@@ -242,7 +244,7 @@


                    jsonObject.put("children", newArray);


                    String reportConfigUuid = object.getString("report_config_uuid");


                    String reportTypeAttr = object.getString("report_type_attr");


                    DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_CONFIG_ATTRIBUTE, " report_type_attr = ? AND report_config_uuid = ? and  grouping != 1 ", new String[]{reportTypeAttr, reportConfigUuid});


                    DataTableEntity dataTableEntity = baseDao.listTable(CmnConst.PRODUCT_SYS_REPORT_CONFIG_ATTRIBUTE, " report_type_attr = ? AND report_config_uuid = ? and  `grouping` != 1 ", new String[]{reportTypeAttr, reportConfigUuid});


                    for (int j = 0; j < dataTableEntity.getRows(); j++) {


                        JSONObject groupNew = JSONObject.parseObject(group.toJSONString());


                        String key = dataTableEntity.getString(j, "grouping");