| | |
| | | //再添加数据 |
| | | 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("#}", ""); |
| | |
| | | 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"); |
| | |
| | | */ |
| | | 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, ") |
| | | sql.append(" SELECT a.uuid auuid,a.detail adetail,a.attribute_name aname,a.subordinateElementType asubordinateElementType,a.is_commonly ais_commonly,a.prompt_name,a.default_value, ") |
| | | .append(" b.uuid buuid,b.detail bdetail,b.attribute_name bname,b.subordinateElementType bsubordinateElementType,b.is_commonly bis_commonly, ") |
| | | .append(" c.uuid cuuid,c.detail cdetail,c.attribute_name cname,c.subordinateElementType csubordinateElementType,c.is_commonly cis_commonly, ") |
| | | .append(" d.uuid duuid,d.detail ddetail,d.attribute_name dname,d.subordinateElementType dsubordinateElementType,d.is_commonly dis_commonly, ") |
| | | .append(" e.uuid euuid,e.detail edetail,e.attribute_name ename,e.subordinateElementType esubordinateElementType,e.is_commonly eis_commonly, ") |
| | | .append(" f.uuid fuuid,f.detail fdetail,f.attribute_name fname,f.subordinateElementType 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 ") |
| | |
| | | String uuid = fieldSetEntity.getString(parameter[paramIndex]+"uuid"); |
| | | //元素子元素类型 |
| | | String subType = fieldSetEntity.getString(parameter[paramIndex]+"subordinateElementType"); |
| | | // 是否常用 |
| | | String isCommonly = fieldSetEntity.getString(parameter[paramIndex]+"is_commonly"); |
| | | JSONObject jsonObject = new JSONObject(); |
| | | jsonObject.put("value",name); |
| | | jsonObject.put("label",detail); |
| | | jsonObject.put("uuid",uuid); |
| | | jsonObject.put("subordinateElementType",subType); |
| | | jsonObject.put("isCommonly", isCommonly); |
| | | jsonObject.put("config_properties",fieldSetEntity.getString("config_properties")); |
| | | paramIndex++; |
| | | if(paramIndex < parameter.length) { |