gx

@@ -6,6 +6,7 @@ use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
+use App\Models\Project\Project;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -35,15 +36,15 @@ class Count extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
-        $deployModel = new DeployBuild();
-        $list = $deployModel->list();
+        $list = DB::table('gl_project')
+            ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
+            ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
+            ->select()->get()->toArray();
         $data = [];
         $data = [];
         $yesterday = Carbon::yesterday()->toDateString();
         $yesterday = Carbon::yesterday()->toDateString();
         foreach ($list as $v){
         foreach ($list as $v){
-            $optimizeModel = new DeployOptimize();
-            $optimizeInfo = $optimizeModel->read(['project_id'=>$v['project_id']]);
-            if($optimizeInfo !== false){
-                $v['test_domain'] = $optimizeInfo['domain'];
+            if($v['domain'] != ''){
+                $v['test_domain'] = $v['domain'];
             }
             }
             $arr = [];
             $arr = [];
             //统计时间
             //统计时间
@@ -56,7 +57,7 @@ class Count extends Command
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             //剩余服务时常
             //剩余服务时常
             if($v['service_duration'] != 0){
             if($v['service_duration'] != 0){
-                $arr['service_day'] = ($v['service_duration'] - Common::getDaysToTargetDate($optimizeInfo['cooperate_date']));
+                $arr['service_day'] = ($v['service_duration'] - Common::getDaysToTargetDate($v['cooperate_date']));
                 $arr['service_day'] = $arr['service_day'] > 0 ? $arr['service_day'] : 0;
                 $arr['service_day'] = $arr['service_day'] > 0 ? $arr['service_day'] : 0;
             }else{
             }else{
                 $arr['service_day'] = 0;
                 $arr['service_day'] = 0;
@@ -144,4 +145,22 @@ class Count extends Command
         }
         }
         return $compliance_day;
         return $compliance_day;
     }
     }
+
+    /**
+     * @name   :(查询参数设置)selectParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:00
+     */
+    public function selectParam(){
+        $select = [
+            'gl_project.id AS user_id',
+            'gl_project_deploy_build.test_domain AS test_domain',
+            'gl_project_deploy_optimize.domain AS domain',
+            'gl_project_deploy_build.project_id AS project_id',
+            'gl_project.cooperate_date AS cooperate_date',
+
+        ];
+        return $select;
+    }
 }
 }