gx

lyh
app/Console/Commands/Project/CountProject.php
--- a/app/Console/Commands/Project/CountProject.php
查看文件 @85b5aa9
+++ b/app/Console/Commands/Project/CountProject.php
查看文件 @85b5aa9
@@ -61,7 +61,7 @@ class countProject extends Command
         $sheet->setCellValue('N1', '上线最慢');
         $sheet->setCellValue('O1', '平均上线天数');
         $rowCount = 2;
-        $allData = $this->countAll();
+//        $allData = $this->countAll();
         foreach ($data as $v) {
             $sheet->setCellValue('A' . $rowCount, $v['month']);
             $sheet->setCellValue('B' . $rowCount, $v['start']);
@@ -69,15 +69,15 @@ class countProject extends Command
             $sheet->setCellValue('D' . $rowCount, $v['month_create_project_count']);
             $sheet->setCellValue('E' . $rowCount, $v['month_project_go_online_count']);
             $sheet->setCellValue('F' . $rowCount, $v['month_project_online_rate']);
-            $sheet->setCellValue('G' . $rowCount, $allData['count']);
-            $sheet->setCellValue('H' . $rowCount, $allData['go_online_count']);
-            $sheet->setCellValue('I' . $rowCount, $allData['promotion_web_count']);
-            $sheet->setCellValue('J' . $rowCount, $allData['create_web_count']);
-            $sheet->setCellValue('K' . $rowCount, $allData['no_go_oline_count']);
-            $sheet->setCellValue('L' . $rowCount, $allData['delete_project_count']);
-            $sheet->setCellValue('M' . $rowCount, $allData['min_project_count']);
-            $sheet->setCellValue('N' . $rowCount, $allData['max_project_count']);
-            $sheet->setCellValue('O' . $rowCount, $allData['average']);
+            $sheet->setCellValue('G' . $rowCount, $v['count']);
+            $sheet->setCellValue('H' . $rowCount, $v['go_online_count']);
+            $sheet->setCellValue('I' . $rowCount, $v['promotion_web_count']);
+            $sheet->setCellValue('J' . $rowCount, $v['create_web_count']);
+            $sheet->setCellValue('K' . $rowCount, $v['no_go_oline_count']);
+            $sheet->setCellValue('L' . $rowCount, $v['delete_project_count']);
+            $sheet->setCellValue('M' . $rowCount, $v['min_project_count']);
+            $sheet->setCellValue('N' . $rowCount, $v['max_project_count']);
+            $sheet->setCellValue('O' . $rowCount, $v['average']);
             $rowCount++;
         }
         // 创建一个新的 Excel Writer 对象
@@ -159,19 +159,19 @@ class countProject extends Command
             $data[$v]['month_project_go_online_count'] = $projectModel->counts(['uptime'=>['between',[$start_time,$end_time]],'deleted_at'=>0]);//当月上线项目数量
             $data[$v]['month_project_online_rate'] = 0;
             if($data[$v]['month_create_project_count'] != 0){
-                $data[$v]['month_project_online_rate'] = $data[$v]['month_project_go_online_count'] / $data[$v]['month_create_project_count'];//比例
+                $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->count(['deleted_at'=>0]);//所有项目总数
-//        $data[$v]['go_online_count'] = $projectModel->count(['uptime'=>['!=',null],'deleted_at'=>0]);//上线项目总数
-//        $data[$v]['promotion_web_count'] = $projectModel->count(['type'=>3,'deleted_at'=>0]);//推广项目总数
-//        $data[$v]['create_web_count'] = $projectModel->count(['type'=>2,'deleted_at'=>0]);//建站项目总数
-//        $data[$v]['no_go_oline_count'] = $projectModel->count(['uptime'=>null,'deleted_at'=>0]);//未上线项目数量
-//        $data[$v]['delete_project_count'] = $projectModel->count(['deleted_at'=>1]);//未上线项目数量
-//        $min_info = $projectModel->select('diff')->selectRaw('(uptime - created_at) as diff')->where('uptime','!=',null)->orderByRaw('diff ASC')->first();
-//        $data[$v]['min_project_count'] = $min_info['diff'];
-//        $max_info = $projectModel->select('diff')->selectRaw('(uptime - created_at) as diff')->where('uptime','!=',null)->orderByRaw('diff Desc')->first();
-//        $data[$v]['max_project_count'] = $max_info['diff'];
-//        $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 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('(uptime - created_at) 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('(uptime - created_at) as diff')->where('uptime','!=',null)->where('created_at','<=',$end_time)->orderByRaw('diff Desc')->first();
+        $data[$v]['max_project_count'] = $max_info['diff'];
+        $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2);
         }
         return $data;
     }