Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -3,6 +3,8 @@
 namespace App\Http\Logic\Aside\Optimize;
 namespace App\Http\Logic\Aside\Optimize;
 
 
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
+use App\Http\Logic\Aside\Manage\ManageLogic;
+use App\Models\Channel\Channel;
 use App\Models\Optimize\Process;
 use App\Models\Optimize\Process;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 
 
@@ -30,9 +32,49 @@ class ProcessLogic extends BaseLogic
      */
      */
     public function processList($map,$page,$row,$order = 'id',$filed = ['*']){
     public function processList($map,$page,$row,$order = 'id',$filed = ['*']){
         $projectModel = new Project();
         $projectModel = new Project();
-        $lists = $projectModel->with('deploy_build')->with('deploy_optimize')->with('payment')
+        $lists = $projectModel->with('deploy_build')
+            ->with('deploy_optimize')->with('payment')->where('process')
             ->select($filed)->orderBy($order,'desc')->where($map)
             ->select($filed)->orderBy($order,'desc')->where($map)
             ->paginate($row, ['*'], 'page', $page);
             ->paginate($row, ['*'], 'page', $page);
+        //数据处理
+        if(!empty($lists['list'])){
+            foreach ($lists['list'] as $k => $item){
+                $item = $this->paramHandle($item);
+                $lists['list'][$k] = $item;
+            }
+        }
         return $this->success($lists);
         return $this->success($lists);
     }
     }
+
+    /**
+     * @remark :参数处理
+     * @name   :paramHandle
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/20 14:29
+     */
+    public function paramHandle($item){
+        $item = [
+            'id' => $item['id'],
+            'title' => $item['title'],
+            'channel' => Channel::getChannelText($item['channel']['user_id'] ?? 0),
+            'key' => $item['deploy_build']['keyword_num'] ?? 0,
+            'day' => $item['deploy_build']['service_duration'] ?? 0,
+            'amount' => $item['payment']['amount'] ?? 0,
+            'build_leader' => ManageLogic::getCacheName($item['deploy_build']['leader_mid'] ?? 0), //组长
+            'build_manager' => ManageLogic::getCacheName($item['deploy_build']['manager_mid'] ?? 0), //项目经理
+            'build_designer' => ManageLogic::getCacheName($item['deploy_build']['designer_mid'] ?? 0), //设计师
+            'build_tech' => ManageLogic::getCacheName($item['deploy_build']['tech_mid'] ?? 0), //技术助理
+            'optimize_manager' => ManageLogic::getCacheName($item['deploy_optimize']['manager_mid'] ?? 0), //优化服务经理
+            'optimize_optimist' => ManageLogic::getCacheName($item['deploy_optimize']['optimist_mid'] ?? 0), //优化师
+            'optimize_assist' => ManageLogic::getCacheName($item['deploy_optimize']['assist_mid'] ?? 0), //优化助理
+            'optimize_tech' => ManageLogic::getCacheName($item['deploy_optimize']['tech_mid'] ?? 0), //售后技术
+            'type' => $this->model::typeMap()[$item['type']] ?? '',
+            'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
+            'domain' => $item['deploy_optimize']['domain'] ?? 0,
+            'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
+            'online_check'=>$item['process']
+        ];
+        return $item;
+    }
 }
 }

@@ -5,6 +5,7 @@ namespace App\Models\Project;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Models\Base;
 use App\Models\Base;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
+use App\Models\Optimize\Process;
 use App\Services\Facades\Upload;
 use App\Services\Facades\Upload;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 
 
@@ -128,6 +129,18 @@ class Project extends Base
     }
     }
 
 
     /**
     /**
+     * @remark :上线审核
+     * @name   :process
+     * @author :lyh
+     * @method :post
+     * @time   :2023/7/20 14:25
+     */
+    public function process()
+    {
+        return self::hasOne(OnlineCheck::class, 'project_id', 'id');
+    }
+
+    /**
      * 建站部署信息
      * 建站部署信息
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      * @return \Illuminate\Database\Eloquent\Relations\HasOne
      * @author zbj
      * @author zbj