fyy

app/Http/Controllers/Api/ScreenController.php

@@ -180,22 +180,17 @@ class ScreenController extends BaseController
         // 获取当前时间
         $date = date('Ymd',time());
         $model = new OrdersProductProcess(['channel' => $date]);//当前季度的数据
+        $result = $this->getDay();
 
         $data = $model->where('del_time',0)
             ->where('status',2)
             ->select('finished_time')
             ->get()->toArray();
-        $result = [];
         if(! empty($data)){
             foreach ($data as $value){
                 $time = date('Y-m-d',$value['finished_time']);
                 if(isset($result[$time])){
                     $result[$time]['output'] += 1;
-                }else{
-                    $result[$time] = [
-                        'time' => $time,
-                        'output' =>  1
-                    ];
                 }
             }
             ksort($result);
@@ -204,6 +199,37 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$result);
     }
 
+    function getDay(){
+        // 获取当前季度的开始日期
+        $quarter = date('Q'); // 获取当前季度的数字表示（1、2、3或4）
+        $year = date('Y'); // 获取当前年份
+
+        if ($quarter == 1) {
+            $startDate = strtotime("$year-01-01"); // 第一季度的开始日期
+        } elseif ($quarter == 2) {
+            $startDate = strtotime("$year-04-01"); // 第二季度的开始日期
+        } elseif ($quarter == 3) {
+            $startDate = strtotime("$year-07-01"); // 第三季度的开始日期
+        } else {
+            $startDate = strtotime("$year-10-01"); // 第四季度的开始日期
+        }
+
+// 获取当前日期
+        $currentDate = time();
+
+// 生成当前季度到今天为止的所有日期
+        $dates = array();
+        while ($currentDate >= $startDate) {
+            $t = date('Y-m-d', $currentDate);
+            $dates[$t] = [
+                'time' => $t,
+                'output' =>  0
+            ];
+            $currentDate = strtotime('-1 day', $currentDate);
+        }
+
+        return $dates;
+    }
     /**
      * 工序负荷全览
      * @param Request $request