周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 aa12b69005883d42f495e4ec28e49f1fb1c240eb 2 个父辈 f663fff2 ccc392f8

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

内嵌 并排对比
正在显示 5 个修改的文件 包含 102 行增加 和 43 行删除
... ... @@ -2,7 +2,9 @@
namespace App\Http\Controllers\Aside\Optimize;
use App\Enums\Common\Code;
use App\Http\Controllers\Aside\BaseController;
use App\Http\Logic\Aside\Optimize\ProcessLogic;
/**
* @remark :上线审核
... ... @@ -19,7 +21,19 @@ class ProcessController extends BaseController
* @method :post
* @time :2023/7/20 11:05
*/
public function lists(){
public function lists(ProcessLogic $processLogic){
$lists = $processLogic->processList($this->map,$this->page,$this->row,$this->order);
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @remark :审核
* @name :save
* @author :lyh
* @method :post
* @time :2023/7/20 13:45
*/
public function save(ProcessLogic $processLogic){
}
}
... ...
... ... @@ -3,6 +3,10 @@
namespace App\Http\Logic\Aside\Optimize;
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\Project\Project;
/**
* @remark :
... ... @@ -16,6 +20,64 @@ class ProcessLogic extends BaseLogic
{
parent::__construct();
$this->param = $this->requestAll;
$this->model = new Projects();
$this->model = new Project();
}
/**
* @remark :获取审核列表
* @name :processList
* @author :lyh
* @method :post
* @time :2023/7/20 13:51
*/
public function processList($map,$page,$row,$order = 'id',$filed = ['*']){
$projectModel = new Project();
$lists = $projectModel->with('deploy_build')
->with('deploy_optimize')->with('payment')->with('online_check')
->select($filed)->orderBy($order,'desc')->where($map)
->paginate($row, ['*'], 'page', $page);
//数据处理
if(!empty($lists)){
$lists = $lists->toArray();
foreach ($lists['list'] as $k => $v){
$item = $this->paramHandle($v);
$lists['list'][$k] = $item;
}
}
return $this->success($lists);
}
/**
* @remark :参数处理
* @name :paramHandle
* @author :lyh
* @method :post
* @time :2023/7/20 14:29
*/
public function paramHandle($item){
$items = [
'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'])),
'optimist_status'=>$item['process']['optimist_status'] ?? 0,
'qa_status'=>$item['process']['qa_status'] ?? 0,
'status'=>$item['process']['status'] ?? 0,
];
return $items;
}
}
... ...
<?php
namespace App\Models\Optimize;
use App\Models\Base;
/**
* @remark :上线审核
* @class :Process.php
* @author :lyh
* @time :2023/7/20 11:12
*/
class Process extends Base
{
}
... ... @@ -5,6 +5,7 @@ namespace App\Models\Project;
use App\Helper\Arr;
use App\Models\Base;
use App\Models\Devops\ServerConfig;
use App\Models\Optimize\Process;
use App\Services\Facades\Upload;
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 online_check()
{
return self::hasOne(OnlineCheck::class, 'project_id', 'id');
}
/**
* 建站部署信息
* @return \Illuminate\Database\Eloquent\Relations\HasOne
* @author zbj
... ...
... ... @@ -196,37 +196,23 @@ Route::middleware(['aloginauth'])->group(function () {
Route::prefix('log')->group(function () {
Route::post('/', [Aside\Optimize\ProjectsLogController::class, 'lists'])->name('projectsLog_lists');
});
});
//gsc账号审核
Route::prefix('optimize')->group(function () {
Route::any('/empowerDomain', [Aside\Optimize\OptimizeController::class, 'empowerDomain'])->name('admin.optimize_empowerDomain');
});
//优化gsc账号记录表
Route::prefix('gsc')->group(function () {
Route::any('/', [Aside\Optimize\ProjectGscController::class, 'lists'])->name('admin.lists');
Route::any('/domainLists', [Aside\Optimize\ProjectGscController::class, 'domainLists'])->name('admin.domainLists');
Route::any('/read', [Aside\Optimize\ProjectGscController::class, 'read'])->name('admin.read');
Route::any('/save', [Aside\Optimize\ProjectGscController::class, 'save'])->name('admin.save');
Route::any('/del', [Aside\Optimize\ProjectGscController::class, 'del'])->name('admin.del');
Route::any('/read', [Aside\Optimize\ProjectGscController::class, 'read'])->name('admin.gsc_read');
Route::any('/save', [Aside\Optimize\ProjectGscController::class, 'save'])->name('admin.gsc_save');
Route::any('/del', [Aside\Optimize\ProjectGscController::class, 'del'])->name('admin.gsc_del');
});
//gsc账号审核
Route::prefix('optimize')->group(function () {
Route::any('/empowerDomain', [Aside\Optimize\OptimizeController::class, 'empowerDomain'])->name('admin.empowerDomain');
//上线审核
Route::prefix('process')->group(function () {
Route::any('/', [Aside\Optimize\ProcessController::class, 'lists'])->name('admin.process_lists');
});
});
// // 公共主题模版
// Route::prefix('template')->group(function () {
// Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
// Route::any('/save', [Aside\Template\ATemplateController::class, 'save'])->name('admin.ATemplate_save');
// Route::any('/status', [Aside\Template\ATemplateController::class, 'status'])->name('admin.ATemplate_status');
// Route::any('/del', [Aside\Template\ATemplateController::class, 'del'])->name('admin.ATemplate_del');
//
// // 左侧模块
// Route::prefix('module')->group(function () {
// Route::any('/', [Aside\Template\ATemplateModuleController::class, 'lists'])->name('admin.ATemplateModule_lists');
// Route::any('/save', [Aside\Template\ATemplateModuleController::class, 'save'])->name('admin.ATemplateModule_save');
// Route::any('/status', [Aside\Template\ATemplateModuleController::class, 'status'])->name('admin.ATemplateModule_status');
// Route::any('/del', [Aside\Template\ATemplateModuleController::class, 'del'])->name('admin.ATemplateModule_del');
// Route::any('/type', [Aside\Template\ATemplateModuleController::class, 'getType'])->name('admin.ATemplateModule_getType');
// });
// });
});
//无需登录验证的路由组
... ...