合并分支 'lyh-server' 到 'master'

gxai创建项目



查看合并请求 !1970

@@ -70,6 +70,7 @@ class AfterDayCount extends Command
             $project_count = $projectModel->where('gl_project.extend_type',0)
             $project_count = $projectModel->where('gl_project.extend_type',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.old_project_id',0)
                 ->where('gl_project.old_project_id',0)
+                ->where('gl_project.title', 'not like', '%复制站%')
                 ->where('gl_project_deploy_optimize.start_date','<=',$date)
                 ->where('gl_project_deploy_optimize.start_date','<=',$date)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project.type',[2,4,6])
                 ->whereIn('gl_project.type',[2,4,6])
@@ -80,6 +81,7 @@ class AfterDayCount extends Command
             $qualified_count = $projectModel->where('gl_project.extend_type',0)
             $qualified_count = $projectModel->where('gl_project.extend_type',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.old_project_id',0)
                 ->where('gl_project.old_project_id',0)
+                ->where('gl_project.title', 'not like', '%复制站%')
                 ->where('gl_project_deploy_optimize.start_date','<=',$date)
                 ->where('gl_project_deploy_optimize.start_date','<=',$date)
                 ->where('gl_project.is_remain_today',1)
                 ->where('gl_project.is_remain_today',1)
                 ->where('gl_project_deploy_build.plan','!=',0)
                 ->where('gl_project_deploy_build.plan','!=',0)
@@ -96,6 +98,7 @@ class AfterDayCount extends Command
             $three_project_count = $projectModel->where('gl_project.extend_type',0)
             $three_project_count = $projectModel->where('gl_project.extend_type',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.old_project_id',0)
                 ->where('gl_project.old_project_id',0)
+                ->where('gl_project.title', 'not like', '%复制站%')
                 ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
                 ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
                 ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
                 ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
@@ -108,6 +111,7 @@ class AfterDayCount extends Command
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.old_project_id',0)
                 ->where('gl_project.old_project_id',0)
                 ->where('gl_project.is_remain_today',1)
                 ->where('gl_project.is_remain_today',1)
+                ->where('gl_project.title', 'not like', '%复制站%')
                 ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
                 ->where('gl_project_deploy_optimize.start_date','>=',$threeMonthsAgo.'-01')
                 ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
                 ->where('gl_project_deploy_optimize.start_date','<=',$threeMonthsAgo.'-31')
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
@@ -125,6 +129,7 @@ class AfterDayCount extends Command
             }
             }
             $data = $projectModel->where('gl_project.extend_type',0)
             $data = $projectModel->where('gl_project.extend_type',0)
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.delete_status',0)
+                ->where('gl_project.title', 'not like', '%复制站%')
                 ->where('gl_project_deploy_optimize.start_date','<=',$date)
                 ->where('gl_project_deploy_optimize.start_date','<=',$date)
                 ->where('gl_project.is_remain_today',1)
                 ->where('gl_project.is_remain_today',1)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)
                 ->whereIn('gl_project_deploy_optimize.optimist_mid',$idArr)