饼图取数修改

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowPieService.java

@@ -130,7 +130,33 @@ public class ShowPieService {
         }
 
         //无分组时Y值
-        value  = showChartsMapper.getPieXValues(yColumn, xColumn, tableName, yAxisType, screenToColumnS);
+        Iterator itX = xAxisData.iterator();
+        while (itX.hasNext()){
+            String xdata = (String)itX.next();
+            if ("".equals(xdata) || xdata == null){
+                //continue;
+            }
+            double valueOne = 0;
+            String valueOnes = null;
+            PieSeriesMap pieSeriesMap = new PieSeriesMap();
+            if ("time".equals(xColumnType)){
+                valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata, screenToColumnS);
+            }else {
+                if (xdata == null || "".equals(xdata)){
+                    valueOnes = showChartsMapper.getValuesIsNull(yColumn, xColumn, tableName, yAxisType, screenToColumnS);
+                }else {
+                    valueOnes = showChartsMapper.getXValue(yColumn, xColumn, tableName, yAxisType, xdata, screenToColumnS);
+                }
+            }
+            if (valueOnes == null || "".equals(valueOnes)){
+                valueOne = 0;
+            }else {
+                valueOne = Double.parseDouble(valueOnes);
+            }
+            pieSeriesMap.setName(xdata);
+            pieSeriesMap.setValue(valueOne);
+            value.add(pieSeriesMap);
+        }
 
         series.setName(pieConfigInfo.getSeries().getColumnName());
         series.setValue(value);