合并分支 'akun' 到 'master'

Akun



查看合并请求 !1335

@@ -20,6 +20,7 @@ use App\Models\Devops\ServerConfig;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\Count;
+use App\Models\Industry\ProjectIndustry;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Manage\BelongingGroup;
 use App\Models\Manage\BelongingGroup;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
@@ -1130,4 +1131,16 @@ class ProjectController extends BaseController
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * 获取项目所有行业列表
+     * @author Akun
+     * @date 2025/03/05 11:40
+     */
+    public function industryList()
+    {
+        $model = new ProjectIndustry();
+        $lists = $model->list(['status' => 1], 'id', ['id', 'industry_name'], 'asc');
+        $this->response('success', Code::SUCCESS, $lists);
+    }
 }
 }

@@ -21,6 +21,7 @@ use App\Models\Com\UpdateLog;
 use App\Models\Devops\Servers;
 use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
+use App\Models\Industry\ProjectIndustryRelated;
 use App\Models\Inquiry\InquiryIP;
 use App\Models\Inquiry\InquiryIP;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Inquiry\InquirySet;
 use App\Models\Manage\Manage;
 use App\Models\Manage\Manage;
@@ -109,6 +110,8 @@ class ProjectLogic extends BaseLogic
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
         $info['minor_languages'] = $this->getProjectMinorLanguages($id);
         //升级项目采集完成时间
         //升级项目采集完成时间
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
         $info['collect_time'] = $info['is_upgrade'] ? UpdateLog::getProjectUpdate($id) : '';
+        //获取项目所属行业
+        $info['industry'] = ProjectIndustryRelated::where('project_id', $id)->pluck('industry_id')->toArray();
 
 
         return $this->success($info);
         return $this->success($info);
     }
     }

@@ -528,6 +528,10 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/', [Aside\Project\AllProjectController::class, 'lists'])->name('admin.all_project_lists');
         Route::any('/', [Aside\Project\AllProjectController::class, 'lists'])->name('admin.all_project_lists');
     });
     });
 
 
+    //项目行业相关
+    Route::prefix('industry')->group(function () {
+        Route::any('/', [Aside\Project\ProjectController::class, 'industryList'])->name('admin.industryList');
+    });
 });
 });
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组