1.修改了筛选不能使用的bug

2.折线图分组
3.周月等不可使用

src/main/java/com/dao/ShowChartsMapper.java

@@ -19,22 +19,21 @@ public interface ShowChartsMapper {
 
 
     //x轴数据
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${xColumn} = #{xdata} ${screen}")
+    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${xColumn} = #{xdata}")
     String getValues(@Param("yAxisName") String yAxisName, @Param("xColumn") String xColumn,
                      @Param("tableName") String tableName, @Param("dataType") String dataType,
-                     @Param("xdata") String xdata, @Param("screen") String screen);
+                     @Param("xdata") String xdata);
 
 
     //查询分组系列
-    @Select("select ${groupsBy} from ${tableName} group by ${groupsBy}")
-    List<String> getGroups(@Param("groupsBy") String groupsBy, @Param("tableName") String tableName);
+    @Select("select ${groupsBy} from ${tableName} ${screen} group by ${groupsBy}")
+    List<String> getGroups(@Param("groupsBy") String groupsBy, @Param("tableName") String tableName, @Param("screen") String screen);
 
     //查询分组的值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} and ${xColumn}=#{xColumnIndex} ${screen}")
+    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} and ${xColumn}=#{xColumnIndex}")
     String getGroupsValue(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
                                @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex,
-                                @Param("xColumn") String xColumn, @Param("xColumnIndex") String xColumnIndex,
-                          @Param("screen") String screen);
+                                @Param("xColumn") String xColumn, @Param("xColumnIndex") String xColumnIndex);
 
 
     //时间类型的X轴
@@ -48,31 +47,31 @@ public interface ShowChartsMapper {
     List<String> getTimeYear(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName, @Param("screen") String screen);
     
     //无分组时间类型值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where (to_char(${xAxisName},${timeType})) = #{xColumnIndex} ${screen}")
+    @Select("select ${dataType}(${yAxisName}) from ${tableName} where (to_char(${xAxisName},${timeType})) = #{xColumnIndex}")
     String getTimeValue (@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                         @Param("xAxisName") String xAxisName, @Param("timeType") String timeType, @Param("xColumnIndex") String xColumnIndex,
-                         @Param("screen") String screen);
+                         @Param("xAxisName") String xAxisName, @Param("timeType") String timeType, @Param("xColumnIndex") String xColumnIndex
+                         );
 
     //无分组半年时间值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where TO_CHAR(${xAxisName},'YYYY-MM') between #{firstIndex} and #{afterIndex} ${screen}")
+    @Select("select ${dataType}(${yAxisName}) from ${tableName} where TO_CHAR(${xAxisName},'YYYY-MM') between #{firstIndex} and #{afterIndex} ")
     String getTimeValueYear(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
                             @Param("xAxisName") String xAxisName, @Param("firstIndex") String firstIndex,
-                            @Param("afterIndex") String afterIndex, @Param("screen") String screen);
+                            @Param("afterIndex") String afterIndex);
 
 
     //查询时间类型分组的值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} and TO_CHAR(${xColumn},${timeType})=#{xColumnIndex} ${screen}")
+    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} and TO_CHAR(${xColumn},${timeType})=#{xColumnIndex} ")
     String getGroupsValueTime(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
                           @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex,
-                          @Param("xColumn") String xColumn, @Param("timeType") String timeType, @Param("xColumnIndex") String xColumnIndex,
-                              @Param("screen") String screen);
+                          @Param("xColumn") String xColumn, @Param("timeType") String timeType, @Param("xColumnIndex") String xColumnIndex
+                           );
 
     //查询分组的值（时间类型半年）
     //分组半年时间值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where TO_CHAR(${xAxisName},'YYYY-MM') between #{firstIndex} and #{afterIndex} and ${groupsColumn}=#{groupsIndex} ${screen}")
+    @Select("select ${dataType}(${yAxisName}) from ${tableName} where TO_CHAR(${xAxisName},'YYYY-MM') between #{firstIndex} and #{afterIndex} and ${groupsColumn}=#{groupsIndex} ")
     String getTimeValueHalfYear(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
                             @Param("xAxisName") String xAxisName, @Param("firstIndex") String firstIndex, @Param("afterIndex") String afterIndex,
-                                @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex, @Param("screen") String screen);
+                                @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex);
 
 
     /*

src/main/java/com/server/ShowHistogramService.java

@@ -91,8 +91,8 @@ public class ShowHistogramService {
             //取筛选列表
             List<Screen> screens = histogramConfigInfo.getFilters();
             ScreenStr scr = new ScreenStr();
-            String screen = "";
-            String screenToColumn = "";
+            String screen = "";               //正常筛选条件
+            String screenToColumn = "";       //跟目标列相同的筛选条件
             if ("".equals(screens) || screens == null || screens.size() == 0){
                 screen = "";
             }else {
@@ -100,17 +100,26 @@ public class ShowHistogramService {
                 screen = scr.getRet();
                 screenToColumn = scr.getWithColumnRet();
                 StringBuilder sb = new StringBuilder(screenToColumn);
-                screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
+                System.out.println("sb:"+sb);
+                if (screenToColumn != null && !("".equals(screenToColumn))){
+                    screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
+                    screen = screenToColumn + " " + screen;
+                    System.out.println("screen:" + screen);
+                }else {
+                    StringBuilder sb1 = new StringBuilder(screen);
+                    screen = String.valueOf(sb1 .replace(1, 5, "where "));
+                }
             }
 
             //X轴
             //判断是否为日期类型
             if ("time".equals(xColumnType)){
-                xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screenToColumn);
+                xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screen);
+                System.out.println("xA:" + xAxisData);
                 xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
                 System.out.println("data:"+xAxisData);
             }else {
-                xAxisData = showChartsMapper.getXAxis(xColumn, tableName, screenToColumn);
+                xAxisData = showChartsMapper.getXAxis(xColumn, tableName, screen);
 
             }
             if ("".equals(xAxisData) || xAxisData == null || xAxisData.size() == 0){
@@ -132,9 +141,9 @@ public class ShowHistogramService {
                 double valueOne = 0;
                 String valueOnes = null;
                 if ("time".equals(xColumnType)){
-                    valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata, screen);
+                    valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata);
                 }else {
-                    valueOnes = showChartsMapper.getValues(yColumn, xColumn, tableName, yAxisType, xdata, screen);
+                    valueOnes = showChartsMapper.getValues(yColumn, xColumn, tableName, yAxisType, xdata);
                 }
                 if (valueOnes == null || "".equals(valueOnes)){
                     valueOne = 0;
@@ -158,7 +167,7 @@ public class ShowHistogramService {
                 //便利分组
                 while (itGroup.hasNext()){
                     String groupByName = (String) itGroup.next(); //每个分组的组名
-                    List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName); //查询每个分组系列
+                    List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName, screen); //查询每个分组系列
                     System.out.println("groupdata:"+ groupsData.toString());
                     Iterator itGroupsData = groupsData.iterator();
 
@@ -185,9 +194,9 @@ public class ShowHistogramService {
                             String groupsValueOnes = null;
                             if ("time".equals(xColumnType)){
                                 groupsValueOnes = timeConverterUtil.getGroupTimeConverter(yAxisType, yColumn, tableName, groupByName, xAxisType,
-                                        groupsName, xColumn, xAxisDataOne, screen);
+                                        groupsName, xColumn, xAxisDataOne);
                             }else {
-                                groupsValueOnes = showChartsMapper.getGroupsValue(yAxisType, yColumn, tableName, groupByName, groupsName, xColumn, xAxisDataOne, screen);
+                                groupsValueOnes = showChartsMapper.getGroupsValue(yAxisType, yColumn, tableName, groupByName, groupsName, xColumn, xAxisDataOne);
                             }
                             if ("".equals(groupsValueOnes) || groupsValueOnes == null){
                                 groupsValueOne = 0;

src/main/java/com/server/ShowLineService.java

@@ -90,14 +90,20 @@ public class ShowLineService {
                 screen = scr.getRet();
                 screenToColumn = scr.getWithColumnRet();
                 StringBuilder sb = new StringBuilder(screenToColumn);
-                screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
+                if (screenToColumn != null && !("".equals(screenToColumn))){
+                    screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
+                    screen = screenToColumn + " " + screen;
+                    System.out.println("screen:" + screen);
+                }else {
+                    StringBuilder sb1 = new StringBuilder(screen);
+                    screen = String.valueOf(sb1 .replace(1, 5, "where "));
+                }
             }
 
         //X轴
         //判断是否为日期类型
-            xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screenToColumn);
+            xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screen);
 //            xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
-            System.out.println("data:"+xAxisData);
 
         if ("".equals(xAxisData) || xAxisData == null || xAxisData.size() == 0){
             return new RepEntity(RepCode.Null);
@@ -113,7 +119,7 @@ public class ShowLineService {
             double valueOne = 0;
             String valueOnes = null;
 //                System.out.println("Y:"+ yColumn + "........x:" + xColumn + "........yAxistype:" + yAxisType + "...xtpye:+"+yAxisType+ "   xdata:"+xdata);
-                valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata, screen);
+                valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata);
 //                System.out.println("value:"+valueOnes);
             if (valueOnes == null || "".equals(valueOnes)){
                 valueOne = 0;
@@ -130,7 +136,6 @@ public class ShowLineService {
         series.setMdata(value);
 
         serieses.add(series);
-        System.out.println(serieses);
 
         //有分组
         if (groupBy.size() != 0){
@@ -140,14 +145,15 @@ public class ShowLineService {
             //便利分组
             while (itGroup.hasNext()){
                 String groupByName = (String) itGroup.next();
-                List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName); //查询每个分组系列
-                System.out.println("groupdata:"+ groupsData.toString());
+                List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName, screen); //查询每个分组系列
                 Iterator itGroupsData = groupsData.iterator();
 
                 //每个分组得到得每个系列
                 while(itGroupsData.hasNext()){
                     String groupsName = (String)itGroupsData.next();
-
+                    if ("".equals(groupsName) || groupsName == null){
+                        continue;
+                    }
                     List<LineSeriesMap> groupsValue = new ArrayList<LineSeriesMap>();
                     Iterator itXAxisData = xAxisData.iterator();
 
@@ -160,7 +166,7 @@ public class ShowLineService {
                         double groupsValueOne = 0;
                         String groupsValueOnes = null;
                         groupsValueOnes = timeConverterUtil.getGroupTimeConverter(yAxisType, yColumn, tableName, groupByName, xAxisType,
-                                    groupsName, xColumn, xAxisDataOne, screen);
+                                    groupsName, xColumn, xAxisDataOne);
                         if ("".equals(groupsValueOnes) || groupsValueOnes == null){
                             groupsValueOne = 0;
                         }else{
@@ -177,7 +183,6 @@ public class ShowLineService {
                     lineSeries.setName(groupsName);
                     serieses.add(lineSeries);
                 }
-                System.out.println(serieses);
             }
         }
 

src/main/java/com/server/ShowPieService.java

@@ -74,17 +74,25 @@ public class ShowPieService {
             screen = scr.getRet();
             screenToColumn = scr.getWithColumnRet();
             StringBuilder sb = new StringBuilder(screenToColumn);
-            screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
+            System.out.println("sb:"+sb);
+            if (screenToColumn != null && !("".equals(screenToColumn))){
+                screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
+                screen = screenToColumn + " " + screen;
+                System.out.println("screen:" + screen);
+            }else {
+                StringBuilder sb1 = new StringBuilder(screen);
+                screen = String.valueOf(sb1 .replace(1, 5, "where "));
+            }
         }
 
         //X轴
         //判断是否为日期类型
         if ("time".equals(xColumnType)){
-            xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screenToColumn);
+            xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screen);
             xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
             System.out.println("data:"+xAxisData);
         }else {
-            xAxisData = showChartsMapper.getXAxis(xColumn, tableName, screenToColumn);
+            xAxisData = showChartsMapper.getXAxis(xColumn, tableName, screen);
 
         }
         if ("".equals(xAxisData) || xAxisData == null || xAxisData.size() == 0){
@@ -116,9 +124,9 @@ public class ShowPieService {
             String valueOnes = null;
             PieSeriesMap pieSeriesMap = new PieSeriesMap();
             if ("time".equals(xColumnType)){
-                valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata, screen);
+                valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata);
             }else {
-                valueOnes = showChartsMapper.getValues(yColumn, xColumn, tableName, yAxisType, xdata, screen);
+                valueOnes = showChartsMapper.getValues(yColumn, xColumn, tableName, yAxisType, xdata);
             }
             if (valueOnes == null || "".equals(valueOnes)){
                 valueOne = 0;

src/main/java/com/server/ShowPopulationService.java

@@ -77,19 +77,19 @@ public class ShowPopulationService {
             Iterator operatorsList = operators.iterator();
             while (operatorsList.hasNext()) {
                 String operator = String.valueOf(operatorsList.next()).toUpperCase();
-                if ("75th".equals(operator)) {
+                if ("75TH".equals(operator)) {
                     String calculation = "MEDIAN";
                     Double median = showChartsMapper.getColumnDev(tableName, columnName, calculation, screenStr);
                     calculation = "MAX";
                     Double max = showChartsMapper.getColumnDev(tableName, columnName, calculation, screenStr);
                     value = showChartsMapper.getValue(tableName, columnName, calculation, median, max);
-                } else if ("25th".equals(operator)) {
+                } else if ("25TH".equals(operator)) {
                     String calculation = "MEDIAN";
                     Double median = showChartsMapper.getColumnDev(tableName, columnName, calculation, screen);
                     calculation = "MIN";
                     Double min = showChartsMapper.getColumnDev(tableName, columnName, calculation, screenStr);
                     value = showChartsMapper.getValue(tableName, columnName, calculation, min, median);
-                } else if ("percentage".equals(operator)) {
+                } else if ("PERCENT".equals(operator)) {
                     value = 1.00;
                 } else {
                     value = showChartsMapper.getColumnDev(tableName, columnName, operator, screenStr);

src/main/java/com/server/ShowScatterService.java

@@ -91,17 +91,24 @@ public class ShowScatterService {
                 screen = scr.getRet();
                 screenToColumn = scr.getWithColumnRet();
                 StringBuilder sb = new StringBuilder(screenToColumn);
-                screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
+                if (screenToColumn != null && !("".equals(screenToColumn))){
+                    screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
+                    screen = screenToColumn + " " + screen;
+                    System.out.println("screen:" + screen);
+                }else {
+                    StringBuilder sb1 = new StringBuilder(screen);
+                    screen = String.valueOf(sb1 .replace(1, 5, "where "));
+                }
             }
 
         //X轴
         //判断是否为日期类型
         if ("time".equals(xColumnType)){
-            xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screenToColumn);
+            xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screen);
             xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
             System.out.println("data:"+xAxisData);
         }else {
-            xAxisData = showChartsMapper.getXAxis(xColumn, tableName, screenToColumn);
+            xAxisData = showChartsMapper.getXAxis(xColumn, tableName, screen);
 
         }
 
@@ -116,9 +123,9 @@ public class ShowScatterService {
             double valueOne = 0;
             String valueOnes = null;
             if ("time".equals(xColumnType)){
-                valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata, screen);
+                valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata);
             }else {
-                valueOnes = showChartsMapper.getValues(yColumn, xColumn, tableName, yAxisType, xdata, screen);
+                valueOnes = showChartsMapper.getValues(yColumn, xColumn, tableName, yAxisType, xdata);
             }
             if (valueOnes == null || "".equals(valueOnes)){
                 valueOne = 0;
@@ -145,7 +152,7 @@ public class ShowScatterService {
             //便利分组
             while (itGroup.hasNext()){
                 String groupByName = (String) itGroup.next();
-                List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName); //查询每个分组系列
+                List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName, screen); //查询每个分组系列
                 System.out.println("groupdata:"+ groupsData.toString());
                 Iterator itGroupsData = groupsData.iterator();
 
@@ -166,9 +173,9 @@ public class ShowScatterService {
                         String groupsValueOnes = null;
                         if ("time".equals(xColumnType)){
                             groupsValueOnes = timeConverterUtil.getGroupTimeConverter(yAxisType, yColumn, tableName, groupByName, xAxisType,
-                                    groupsName, xColumn, xAxisDataOne, screen);
+                                    groupsName, xColumn, xAxisDataOne);
                         }else {
-                            groupsValueOnes = showChartsMapper.getGroupsValue(yAxisType, yColumn, tableName, groupByName, groupsName, xColumn, xAxisDataOne, screen);
+                            groupsValueOnes = showChartsMapper.getGroupsValue(yAxisType, yColumn, tableName, groupByName, groupsName, xColumn, xAxisDataOne);
                         }
                         if ("".equals(groupsValueOnes) || groupsValueOnes == null){
                             groupsValueOne = 0;

src/main/java/com/server/TimeConverterUtil.java

@@ -50,6 +50,9 @@ public class TimeConverterUtil {
         Iterator isDataList = dataList.iterator();
         while (isDataList.hasNext()){
             String data = (String) isDataList.next();
+            if (data == null || "".equals(data)){
+                continue;
+            }
             if ("quarter".equals(timeType)){
                 String[] str = data.split("-");
                 dataLast = str[0] + "-Q" + str[1];
@@ -66,7 +69,7 @@ public class TimeConverterUtil {
     }
 
     //无分组时间值
-    public String getTimeValueConverter(String yColumn, String xColumn, String tableName, String dataType, String timeType, String xdata, String screen){
+    public String getTimeValueConverter(String yColumn, String xColumn, String tableName, String dataType, String timeType, String xdata){
 
         String timeGroup = "'YYYY-MM-DD'";
         String value = null;
@@ -76,70 +79,70 @@ public class TimeConverterUtil {
             if ("H1".equals(str[1])){
                 String firstIndex = str[0] + "-01";
                 String afterIndex = str[0] + "-06";
-                value = showChartsMapper.getTimeValueYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, screen);
+                value = showChartsMapper.getTimeValueYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex);
             }else {
                 String firstIndex = str[0] + "-07";
                 String afterIndex = str[0] + "-12";
-                value = showChartsMapper.getTimeValueYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, screen);
+                value = showChartsMapper.getTimeValueYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex);
             }
         }else if ("year".equals(timeType)){
             timeGroup = "'YYYY'";
-            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata,screen);
+            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata);
         }else if ("month".equals(timeType)){
             timeGroup = "'YYYY-MM'";
-            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata,screen);
+            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata);
         }else if ("day".equals(timeType) || "".equals(timeType)){
-            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata,screen);
+            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata);
         }else if ("quarter".equals(timeType)){
             timeGroup = "'YYYY-Q'";
-            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata,screen);
+            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata);
         }else if ("week".equals(timeType)){
             timeGroup = "'YYYY-WW'";
-            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata,screen);
+            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata);
         }else {
-            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata,screen);
+            value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup,xdata);
         }
         return value;
     }
 
     //有分组时间类型值处理
     public String getGroupTimeConverter(String dataType, String yColumn, String tableName, String groupByName, String timeType,
-                                        String groupsName, String xColumn, String xAxisDataOne, String screen){
+                                        String groupsName, String xColumn, String xAxisDataOne){
         String timeGroup = "'YYYY-MM-DD'";
         String value = null;
         if ("year".equals(timeType)){
             timeGroup = "'YYYY'";
             value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                    timeGroup, xAxisDataOne, screen);
+                    timeGroup, xAxisDataOne);
         }else if ("month".equals(timeType)){
             timeGroup = "'YYYY-MM'";
             value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                    timeGroup, xAxisDataOne ,screen);
+                    timeGroup, xAxisDataOne);
         }else if ("quarter".equals(timeType)){
             timeGroup = "'YYYY-Q'";
             value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                    timeGroup, xAxisDataOne, screen);
+                    timeGroup, xAxisDataOne);
         }else if ("week".equals(timeType)){
             timeGroup = "'YYYY-WW'";
             value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                    timeGroup, xAxisDataOne, screen);
+                    timeGroup, xAxisDataOne);
         }else if ("day".equals(timeType) || "".equals(timeType)){
             value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                    timeGroup, xAxisDataOne, screen);
+                    timeGroup, xAxisDataOne);
         }else if ("halfYear".equals(timeType)){
             String[] str = xAxisDataOne.split("-");
             if ("上半年".equals(str[1])){
                 String firstIndex = str[0] + "-01";
                 String afterIndex = str[0] + "-06";
-                value = showChartsMapper.getTimeValueHalfYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, groupByName, groupsName, screen);
+                value = showChartsMapper.getTimeValueHalfYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, groupByName, groupsName);
             }else {
                 String firstIndex = str[0] + "-07";
                 String afterIndex = str[0] + "-12";
-                value = showChartsMapper.getTimeValueHalfYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, groupByName, groupsName, screen);
+                value = showChartsMapper.getTimeValueHalfYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, groupByName, groupsName);
             }
         }else{
             value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                    timeGroup, xAxisDataOne, screen);
+                    timeGroup, xAxisDataOne);
         }
         return value;
     }