atiuajhnd

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -568,14 +568,18 @@ public class StatisticalReportController extends BaseRESTfulController {
                                              Integer pageSize,
                                              String startTime,
                                              String endTime,
-                                             String con){
-        if (con != null && !"undefined".equals(con)) {
+                                             String con,
+                                             String yes){
+        if (con != null && !"null".equals(con)) {
             map.put("con",con);
         }
         DataChange.queryDataByDateTime(startTime ,endTime, map, sdfDateTime);//根据时间段查询数据
+        if(yes != null && !"null".equals(yes)){
+            return success(statisticalReportService.getCapacityByDefend(map));
+        }
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> report = statisticalReportService.getCapacityByDefend(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
+        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, report);
         return success(pageList);
 
     }