BUG修复

bi-server/src/main/java/com/usoftchina/bi/server/controller/dashboard/DefaultDashboardController.java

@@ -41,7 +41,7 @@ public class DefaultDashboardController {
     @CheckToken
     @ApiOperation(value = "取消首页默认报表", notes = "取消首页默认报表", response = RepEntity.class)
     public RepEntity delete(@RequestHeader String token, @PathVariable("userId") int userId, @PathVariable("dashboardId") int dashboardId){
-        defaultDashboardService.delete(userId, dashboardId);
+        defaultDashboardService.delete(dashboardId);
         return new RepEntity(RepCode.success, null);
     }
 

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

@@ -131,7 +131,7 @@ public interface ShowChartsMapper {
 
 
     //查询时间类型分组的值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} and TO_CHAR(${xColumn},${timeType})=#{xColumnIndex} ")
+    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} and TO_CHAR(${xColumn},${timeType})=#{xColumnIndex, jdbcType=VARCHAR} ")
     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