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

+<?php
+/**
+ * @remark :
+ * @name   :AllProjectController.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/11/12 9:34
+ */
+
+namespace App\Http\Controllers\Aside\Project;
+
+use App\Enums\Common\Code;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\Project\CountAllProject;
+
+/**
+ * @remark :统计所有项目（4.0,5.0,6.0）
+ * @name   :AllProjectController
+ * @author :lyh
+ * @method :post
+ * @time   :2024/11/12 9:34
+ */
+class AllProjectController extends BaseController
+{
+    /**
+     * @remark :统计所有项目列表
+     * @name   :lists
+     * @author :lyh
+     * @method :post
+     * @time   :2024/11/12 9:35
+     */
+    public function lists(CountAllProject $allProject){
+        $data = $allProject->lists($this->map,$this->page,$this->row);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+}

@@ -277,6 +277,7 @@ class UserLoginLogic
         $info['service_duration'] = $project['deploy_build']['service_duration'] ?? 0;
         $info['service_duration'] = $project['deploy_build']['service_duration'] ?? 0;
         $info['is_comment'] = $project['deploy_build']['is_comment'] ?? 0;
         $info['is_comment'] = $project['deploy_build']['is_comment'] ?? 0;
         $info['remain_day'] = $project['remain_day'] ?? 0;
         $info['remain_day'] = $project['remain_day'] ?? 0;
+        $info['type'] = $project['type'] ?? 1;
         if($info['is_customized'] == 1){
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
             $info['is_visualization'] = json_decode($project['is_visualization']);
         }
         }

@@ -493,6 +493,11 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/fb_relay_detail_list', [Aside\Task\AdsController::class, 'fbRelayDetail'])->name('admin.fb_ads_relay_detail_list');
         Route::any('/fb_relay_detail_list', [Aside\Task\AdsController::class, 'fbRelayDetail'])->name('admin.fb_ads_relay_detail_list');
         Route::any('/fb_relay_count', [Aside\Task\AdsController::class, 'fbRelayCount'])->name('admin.fb_relay_count');
         Route::any('/fb_relay_count', [Aside\Task\AdsController::class, 'fbRelayCount'])->name('admin.fb_relay_count');
     });
     });
+
+    //统计所有项目相关
+    Route::prefix('all_project')->group(function () {
+        Route::any('/', [Aside\Project\AllProjectController::class, 'lists'])->name('admin.all_project_lists');
+    });
 });
 });
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组