增加未分组if判断

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

@@ -131,45 +131,45 @@ public class ShowScatterService {
         if ("".equals(xAxisData) || xAxisData == null || xAxisData.size() == 0){
             return new RepEntity(RepCode.Null);
         }
-
-        //无分组时Y值
-        if (!"time".equals(xColumnType)) {
-            if (StringUtils.isEmpty(screenToColumnS)) {
-                screenToColumnS = " 1 = 1 ";
-            }
-            value = showChartsMapper.getXAndYValues(yColumn, xColumn, tableName, yAxisType, screenToColumnS);
-        }else {
-            Iterator itX = xAxisData.iterator();
-            while (itX.hasNext()) {
-                String xdata = (String) itX.next();
-                double valueOne = 0;
-                String valueOnes = null;
-                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);
+        if (groupBy.size() == 0) {
+            //无分组时Y值
+            if (!"time".equals(xColumnType)) {
+                if (StringUtils.isEmpty(screenToColumnS)) {
+                    screenToColumnS = " 1 = 1 ";
+                }
+                value = showChartsMapper.getXAndYValues(yColumn, xColumn, tableName, yAxisType, screenToColumnS);
+            } else {
+                Iterator itX = xAxisData.iterator();
+                while (itX.hasNext()) {
+                    String xdata = (String) itX.next();
+                    double valueOne = 0;
+                    String valueOnes = null;
+                    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 {
-                        valueOnes = showChartsMapper.getXValue(yColumn, xColumn, tableName, yAxisType, xdata, screenToColumnS);
+                        valueOne = Double.parseDouble(valueOnes);
                     }
+                    LineSeriesMap lineSeriesMap = new LineSeriesMap();
+                    lineSeriesMap.setValue(valueOne);
+                    lineSeriesMap.setDate(xdata);
+                    value.add(lineSeriesMap);
                 }
-                if (valueOnes == null || "".equals(valueOnes)) {
-                    valueOne = 0;
-                } else {
-                    valueOne = Double.parseDouble(valueOnes);
-                }
-                LineSeriesMap lineSeriesMap = new LineSeriesMap();
-                lineSeriesMap.setValue(valueOne);
-                lineSeriesMap.setDate(xdata);
-                value.add(lineSeriesMap);
             }
-        }
-        LineSeries series = new LineSeries();
+            LineSeries series = new LineSeries();
 //        series.setName(yColumn);
-        series.setMdata(value);
-
-        serieses.add(series);
+            series.setMdata(value);
 
+            serieses.add(series);
+        }
         //有分组
         if (groupBy.size() != 0){
             serieses.remove(0);