gx

@@ -19,6 +19,7 @@ use App\Models\Manage\ManageHr;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\Payment;
 use App\Models\Project\Payment;
+use App\Models\Project\Project;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 
 
 
 
@@ -36,16 +37,17 @@ class ProjectController extends BaseController
     {
     {
         $map = [];
         $map = [];
         //搜索类型
         //搜索类型
-        if(isset($this->param['type']) && !empty($this->param['type'])){
-            if($this->param['type'] == 3){//推广中
-                $map[] = ['type', 'in' ,[4,6]];
-            }elseif($this->param['type'] == 2){//建站完成
-                $map[] = ['type', 'in', [2,3]];
-            }elseif($this->param['type'] == 1){//建站中
-                $map[] = ['type',1];
+        if(isset($this->param['type']) && $this->param['type'] == Project::TYPE_THREE){
+            $map[] = ['type', 'in' ,[Project::TYPE_FOUR,Project::TYPE_SIX]];
         }
         }
-        }else{
-            $map[] = ['type',0];//初始导入项目
+        if(isset($this->param['type']) && $this->param['type'] == Project::TYPE_TWO){
+            $map[] = ['type', 'in', [Project::TYPE_TWO,Project::TYPE_THREE]];
+        }
+        if(isset($this->param['type']) && $this->param['type'] == Project::TYPE_ONE){
+            $map[] = ['type',Project::TYPE_ONE];
+        }
+        if(isset($this->param['type']) && $this->param['type'] == Project::TYPE_ZERO){
+            $map[] = ['type',Project::TYPE_ZERO];
         }
         }
         //搜索技术组
         //搜索技术组
         if(!empty($this->param['dep_id'])){
         if(!empty($this->param['dep_id'])){

@@ -17,7 +17,13 @@ class Project extends Base
     const DATABASE_NAME_FIX = 'gl_data_';
     const DATABASE_NAME_FIX = 'gl_data_';
 
 
     const STATUS_ONE = 1;//审核通过
     const STATUS_ONE = 1;//审核通过
+    const TYPE_ZERO = 0;//初始导入项目
+    const TYPE_ONE = 1;//建站中
+    const TYPE_TWO = 2;//建站完成
+    const TYPE_THREE = 3;//建站完成（推广）
+    const TYPE_FOUR = 4;//推广续费
     const TYPE_FIVE = 5;//未续费网站
     const TYPE_FIVE = 5;//未续费网站
+    const TYPE_SIX = 6;//特殊推广项目
     /**
     /**
      * 星级客户
      * 星级客户
      * @return string[]
      * @return string[]