gx

@@ -161,16 +161,26 @@ class countProject extends Command
             if($data[$v]['month_create_project_count'] != 0){
             if($data[$v]['month_create_project_count'] != 0){
                 $data[$v]['month_project_online_rate'] = round($data[$v]['month_project_go_online_count'] / $data[$v]['month_create_project_count'],2);//比例
                 $data[$v]['month_project_online_rate'] = round($data[$v]['month_project_go_online_count'] / $data[$v]['month_create_project_count'],2);//比例
             }
             }
-        $data[$v]['count'] = $projectModel->counts(['deleted_at'=>0,'created_at'=>['<=',$end_time]]);//所有项目总数
-        $data[$v]['go_online_count'] = $projectModel->counts(['uptime'=>['!=',null],'deleted_status'=>0,'created_at'=>['<=',$end_time]]);//上线项目总数
-        $data[$v]['promotion_web_count'] = $projectModel->counts(['type'=>3,'deleted_status'=>0,'created_at'=>['<=',$end_time]]);//推广项目总数
-        $data[$v]['create_web_count'] = $projectModel->counts(['type'=>2,'deleted_status'=>0,'created_at'=>['<=',$end_time]]);//建站项目总数
-        $data[$v]['no_go_oline_count'] = $projectModel->counts(['uptime'=>null,'deleted_status'=>0,'created_at'=>['<=',$end_time]]);//未上线项目数量
-        $data[$v]['delete_project_count'] = $projectModel->counts(['deleted_status'=>1,'created_at'=>['<=',$end_time]]);//删除
-        $min_info = $projectModel->select('diff')->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')->where('uptime','!=',null)->where('created_at','<=',$end_time)->orderByRaw('diff ASC')->first();
-        $data[$v]['min_project_count'] = $min_info['diff'];
-        $max_info = $projectModel->select('diff')->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')->where('uptime','!=',null)->where('created_at','<=',$end_time)->orderByRaw('diff Desc')->first();
-        $data[$v]['max_project_count'] = $max_info['diff'];
+        $data[$v]['count'] = $projectModel->counts(['deleted_status'=>0]);//所有项目总数
+        $data[$v]['go_online_count'] = $projectModel->counts(['uptime'=>['!=',null],'deleted_status'=>0]);//上线项目总数
+        $data[$v]['promotion_web_count'] = $projectModel->counts(['type'=>3,'deleted_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//推广项目总数
+        $data[$v]['create_web_count'] = $projectModel->counts(['type'=>2,'deleted_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//建站项目总数
+        $data[$v]['no_go_oline_count'] = $projectModel->counts(['uptime'=>null,'deleted_status'=>0,'created_at'=>['between',[$start_time,$end_time]]]);//未上线项目数量
+        $data[$v]['delete_project_count'] = $projectModel->counts(['deleted_status'=>1,'created_at'=>['between',[$start_time,$end_time]]]);//删除
+        $min_info = $projectModel->select('*')
+            ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
+            ->whereNotNull('uptime')   // 确保 uptime 字段不为空
+            ->where('created_at','<=',$end_time)
+            ->orderByRaw('diff ASC')
+            ->first();
+        $data[$v]['min_project_count']['min_project_count'] = $min_info['diff'];
+        $max_info = $projectModel->select('*')
+            ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
+            ->whereNotNull('uptime')   // 确保 uptime 字段不为空
+            ->where('created_at','<=',$end_time)
+            ->orderByRaw('diff DESC')
+            ->first();
+        $data[$v]['min_project_count']['max_project_count'] = $max_info['diff'];
         $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2);
         $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2);
         }
         }
         return $data;
         return $data;