统计日期方法调整

Modules/OpcData/Http/Controllers/Api/CarIllegalDownController.php

@@ -13,6 +13,7 @@ class CarIllegalDownController extends BaseController
 
     public function getList(Request $request) {
 
+
         $mineCode = isset($request->mine_code) ? $request->mine_code : null;     // 矿分类
         $stateDate = isset($request->date) ? $request->date : date("Y-m-d"); // 统计日期
 
@@ -62,20 +63,18 @@ class CarIllegalDownController extends BaseController
         ];
 
         // 一周内超速趋势
-        for($i = 0; $i < 7; $i++) {
+        for($i = 1; $i <= 7; $i++) {
 
-            $stime = date("Y-m-d 00:00:00", strtotime("-".$i." day"));
-//            $etime = date("Y-m-d 23:59:59", strtotime("-".$i." day"));
+            $stateDate = date("Y-m-d", strtotime("-".(7-$i)." day"));
 
-//            $res = $this->getCarIllegalByTimeSpan($stime, $etime, $mineCode);
-            $res = $this->getCarIllegalCount($stime, $mineCode);
-            $categories3[]= date("m-d", strtotime("-".$i." day"));;
-            $data3['data'][] = $res[0]->con;
+            $res = $this->getCarIllegalCount($stateDate, $mineCode);
+            $categories3[]= substr($stateDate, -5);
+            $data3['data'][] = $res[0]->con ?? 0;
         }
         $data3['name']="数量";
         $res2 = [
-            'categories'=>array_reverse($categories3),
-            'series'=>[array_reverse($data3)],
+            'categories'=>$categories3,
+            'series'=>[$data3],
         ];
 
         // 违章数据列表
@@ -93,7 +92,7 @@ class CarIllegalDownController extends BaseController
     // 今日超速统计
     public function getCarIllegalCount($stateDate, $mineCode='zaoquan') {
 
-        $sqlStr = "select count(car_num) con from down_car_speed_warn where state_date = '".date("Y-m-d", strtotime($stateDate))."'";
+        $sqlStr = "select state_date, count(car_num) con from down_car_speed_warn where state_date = '".date("Y-m-d", strtotime($stateDate))."' order by state_date desc";
 
         return $this->executeSql($sqlStr, 2, $mineCode);