【BI商业智能】【报表】【时间筛选】

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

@@ -37,9 +37,6 @@ public interface ChartsConfigMapper {
             "where bc.id = #{id, jdbcType=INTEGER}")
     ChartConfig getOneChart(int id);
 
-    @Select("select thumbnail from bi_charts where id = #{id, jdbcType=INTEGER}")
-    ChartConfig getOneThumbnail(int id);
-
     @Select("select DATA_NAME as name from BI_DATA_CONNECTORS where id = #{id}")
     String getDataNameById(int id);
 

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

@@ -91,10 +91,6 @@ public class ChartsConfigService {
         if (chartConfig.getStyle() == null){
             chartConfig.setStyle("");
         }
-        JSONArray jsonArray = JSONObject.parseArray("["+chartConfig.getFetchConfig()+"]");
-        int sid = Integer.parseInt(jsonArray.getJSONObject(0).get("id").toString());
-        String thumbnail = chartsConfigMapper.getOneThumbnail(sid).getThumbnail();
-        chartConfig.setThumbnail(thumbnail);
         chartsConfigMapper.insertCharts(chartConfig);
         int id = chartConfig.getChartId();
 

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

@@ -81,6 +81,9 @@ public class ShowPopulationService {
                         Double median = showChartsMapper.getColumnDev(tableName, columnName, calculation, screenStr);
                         calculation = "MAX";
                         Double max = showChartsMapper.getColumnDev(tableName, columnName, calculation, screenStr);
+                        if (max == null) {
+                            return new RepEntity(RepCode.Null);
+                        }
                         value = showChartsMapper.getValue(tableName, columnName, calculation, median, max);
                     } else if ("25TH".equalsIgnoreCase(operator)) {
                         String calculation = "MEDIAN";

bi-server/src/main/java/com/usoftchina/bi/server/service/dashboard/DashboardsToChartsUtilService.java

@@ -137,7 +137,9 @@ public class DashboardsToChartsUtilService {
             e.printStackTrace();
         }
         RepEntity<PopAndIndDataInfo> repEntity = showPopulationService.showPopulation(populationInfo, token, chartId);
-        repEntity.getData().setStyleConfig(styleConfig);
+        if (repEntity.getCode() == 200) {
+            repEntity.getData().setStyleConfig(styleConfig);
+        }
         return repEntity;
     }