周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 215e27c82fad868a23bb3e3dc22f341e0a94f780 1 个父辈 a75992d7

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 12 行增加 和 13 行删除
@@ -18,7 +18,6 @@ class ManageLogic extends BaseLogic @@ -18,7 +18,6 @@ class ManageLogic extends BaseLogic
18 public function __construct() 18 public function __construct()
19 { 19 {
20 parent::__construct(); 20 parent::__construct();
21 -  
22 $this->model = new Manage(); 21 $this->model = new Manage();
23 } 22 }
24 23
@@ -30,8 +29,8 @@ class ManageLogic extends BaseLogic @@ -30,8 +29,8 @@ class ManageLogic extends BaseLogic
30 } 29 }
31 30
32 31
33 - public static function getCacheName($id){  
34 - $info = (new self())->getCacheInfo($id); 32 + public function getCacheName($id){
  33 + $info = $this->model->read(['id'=>$id]);
35 return $info['name'] ?? ''; 34 return $info['name'] ?? '';
36 } 35 }
37 } 36 }
@@ -52,14 +52,14 @@ class ProjectLogic extends BaseLogic @@ -52,14 +52,14 @@ class ProjectLogic extends BaseLogic
52 'key' => $item['deploy_build']['keyword_num'] ?? 0, 52 'key' => $item['deploy_build']['keyword_num'] ?? 0,
53 'day' => $item['deploy_build']['service_duration'] ?? 0, 53 'day' => $item['deploy_build']['service_duration'] ?? 0,
54 'amount' => $item['payment']['amount'] ?? 0, 54 'amount' => $item['payment']['amount'] ?? 0,
55 - 'build_leader' => ManageLogic::getCacheName($item['deploy_build']['leader_mid'] ?? 0), //组长  
56 - 'build_manager' => ManageLogic::getCacheName($item['deploy_build']['manager_mid'] ?? 0), //项目经理  
57 - 'build_designer' => ManageLogic::getCacheName($item['deploy_build']['designer_mid'] ?? 0), //设计师  
58 - 'build_tech' => ManageLogic::getCacheName($item['deploy_build']['tech_mid'] ?? 0), //技术助理  
59 - 'optimize_manager' => ManageLogic::getCacheName($item['deploy_optimize']['manager_mid'] ?? 0), //优化服务经理  
60 - 'optimize_optimist' => ManageLogic::getCacheName($item['deploy_optimize']['optimist_mid'] ?? 0), //优化师  
61 - 'optimize_assist' => ManageLogic::getCacheName($item['deploy_optimize']['assist_mid'] ?? 0), //优化助理  
62 - 'optimize_tech' => ManageLogic::getCacheName($item['deploy_optimize']['tech_mid'] ?? 0), //售后技术 55 + 'build_leader' => (new ManageLogic)->getCacheName($item['deploy_build']['leader_mid'] ?? 0), //组长
  56 + 'build_manager' => (new ManageLogic)->getCacheName($item['deploy_build']['manager_mid'] ?? 0), //项目经理
  57 + 'build_designer' => (new ManageLogic)->getCacheName($item['deploy_build']['designer_mid'] ?? 0), //设计师
  58 + 'build_tech' => (new ManageLogic)->getCacheName($item['deploy_build']['tech_mid'] ?? 0), //技术助理
  59 + 'optimize_manager' => (new ManageLogic)->getCacheName($item['deploy_optimize']['manager_mid'] ?? 0), //优化服务经理
  60 + 'optimize_optimist' => (new ManageLogic)->getCacheName($item['deploy_optimize']['optimist_mid'] ?? 0), //优化师
  61 + 'optimize_assist' => (new ManageLogic)->getCacheName($item['deploy_optimize']['assist_mid'] ?? 0), //优化助理
  62 + 'optimize_tech' => (new ManageLogic)->getCacheName($item['deploy_optimize']['tech_mid'] ?? 0), //售后技术
63 'type' => $item['type'], 63 'type' => $item['type'],
64 'test_domain' => $item['deploy_build']['test_domain'] ?? 0, 64 'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
65 'plan' => $item['deploy_build']['plan'] ?? 0, 65 'plan' => $item['deploy_build']['plan'] ?? 0,
@@ -109,7 +109,7 @@ class ProjectLogic extends BaseLogic @@ -109,7 +109,7 @@ class ProjectLogic extends BaseLogic
109 $info = $this->model->with('payment')->with('deploy_build') 109 $info = $this->model->with('payment')->with('deploy_build')
110 ->with('deploy_optimize')->with('online_check')->where(['id'=>$id])->first(); 110 ->with('deploy_optimize')->with('online_check')->where(['id'=>$id])->first();
111 if(isset($info['online_check']['created_manage_id']) && !empty($info['online_check']['created_manage_id'])){ 111 if(isset($info['online_check']['created_manage_id']) && !empty($info['online_check']['created_manage_id'])){
112 - $info['online_check']['name'] = ManageLogic::getCacheName($info['online_check']['created_manage_id']); 112 + $info['online_check']['name'] = (new ManageLogic)->getCacheName($info['online_check']['created_manage_id']);
113 } 113 }
114 if(isset($info['serve_id']) && !empty($info['serve_id'])){ 114 if(isset($info['serve_id']) && !empty($info['serve_id'])){
115 $info['serve_id_name'] = (new ServerConfig())->read(['id'=>$info['serve_id']])['title']; 115 $info['serve_id_name'] = (new ServerConfig())->read(['id'=>$info['serve_id']])['title'];
@@ -51,7 +51,7 @@ class TaskLogic extends BaseLogic @@ -51,7 +51,7 @@ class TaskLogic extends BaseLogic
51 $map[] = ['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()]; 51 $map[] = ['id', 'in', TaskOwner::where('manage_id', $v['manage_id'])->pluck('task_id')->toArray()];
52 $list[] = [ 52 $list[] = [
53 "manage_id" => $v['manage_id'], 53 "manage_id" => $v['manage_id'],
54 - "manage_id_text" => ManageLogic::getCacheName($v['manage_id']), 54 + "manage_id_text" => (new ManageLogic)->getCacheName($v['manage_id']),
55 "count" => $v['count'], 55 "count" => $v['count'],
56 "task_list" => $this->getList($map, $sort, $columns)['list'] ?? [] 56 "task_list" => $this->getList($map, $sort, $columns)['list'] ?? []
57 ]; 57 ];