Merge branch 'feature-refactor' of ssh://10.10.100.21/source/platform-bi-server into feature-refactor

bi-core/src/main/java/com/usoftchina/bi/core/base/RepCode.java

@@ -24,7 +24,7 @@ public enum  RepCode {
     DashboardNonExistent(-510, "看板不存在"),
     DATACONNECTOR_USED_DATASOURCE(-511, "已有数据源使用了此连接,无法删除!"),
     CHARTS_USED_DATACONNECTOR(-512, "该数据源存在关联的图表，不允许删除!"),
-    DASHBOARD_USED_CHARTS(-513, "已有看板使用了此图表,无法删除!"),
+    DASHBOARD_USED_CHARTS(-513, "该图表存在关联的报表，不允许删除!"),
     MENU_USED_DASHBOARD(-514, "此目录下存在看板,无法删除!");
 
     private int code;

bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ShowChartsMapper.java

@@ -145,7 +145,7 @@ public interface ShowChartsMapper {
     );
 
     //查询时间类型分组的值->优化后(柱状图)
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} GROUP BY TO_CHAR(${xColumn},${timeType}) GROUP BY TO_CHAR(${xColumn},${timeType})")
+    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} GROUP BY TO_CHAR(${xColumn},${timeType}) ORDER BY TO_CHAR(${xColumn},${timeType})")
     List<Double> getHistogramTimeValueGroupValuesTime(@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);

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

@@ -177,8 +177,8 @@ public class ShowHistogramService {
                             double groupsValueOne = 0;
                             String groupsValueOnes = null;
                             if ("time".equals(xColumnType)){
-                                groupsValue = timeConverterUtil.getHistogramGroupTime(yAxisType, yColumn, tableName, groupByName, xAxisType,
-                                        groupsName, xColumn, xAxisData, screenToColumnS);
+                                groupsValueOnes = timeConverterUtil.getGroupTimeConverter(yAxisType, yColumn, tableName, groupByName, xAxisType,
+                                        groupsName, xColumn, xAxisDataOne, screenToColumnS);
                             }else {
                                 String xColumnKey = "";
                                 if (xAxisDataOne == null || "".equals(xAxisDataOne)){
@@ -201,6 +201,7 @@ public class ShowHistogramService {
                             }else{
                                 groupsValueOne = Double.parseDouble(groupsValueOnes);
                             }
+
                             groupsValue.add(groupsValueOne);
                         }
                         ne.setValue(groupsValue);