gx

@@ -47,39 +47,37 @@ class ProjectLogic extends BaseLogic
         parent::setWith(['payment', 'deploy_build', 'deploy_optimize','online_check']);
         parent::setWith(['payment', 'deploy_build', 'deploy_optimize','online_check']);
         $list =  parent::getList($map, $sort, ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'created_at'], $limit);
         $list =  parent::getList($map, $sort, ['id', 'title', 'mysql_id' ,'channel','cooperate_date' ,'type', 'created_at'], $limit);
         $managerLogic = new ManageLogic();
         $managerLogic = new ManageLogic();
-        foreach ($list['list'] as &$item){
-//            var_dump($item['id']);
-
-            var_dump(APublicModel::getProductNumByProjectId(1));
-//            $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' => $managerLogic->getCacheName($item['deploy_build']['leader_mid'] ?? 0), //组长
-//                'build_manager' => $managerLogic->getCacheName($item['deploy_build']['manager_mid'] ?? 0), //项目经理
-//                'build_designer' => $managerLogic->getCacheName($item['deploy_build']['designer_mid'] ?? 0), //设计师
-//                'build_tech' => $managerLogic->getCacheName($item['deploy_build']['tech_mid'] ?? 0), //技术助理
-//                'optimize_manager' => $managerLogic->getCacheName($item['deploy_optimize']['manager_mid'] ?? 0), //优化服务经理
-//                'optimize_optimist' => $managerLogic->getCacheName($item['deploy_optimize']['optimist_mid'] ?? 0), //优化师
-//                'optimize_assist' => $managerLogic->getCacheName($item['deploy_optimize']['assist_mid'] ?? 0), //优化助理
-//                'optimize_tech' => $managerLogic->getCacheName($item['deploy_optimize']['tech_mid'] ?? 0), //售后技术
-//                'type' => $item['type'],
-//                'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
-//                'plan' =>Project::planMap()[$item['deploy_build']['plan']],
-//                'domain' => $item['deploy_optimize']['domain'] ?? 0,
-//                'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
-//                'product_num' => ($item['mysql_id'] != 0) ? APublicModel::getProductNumByProjectId($item['id']) : 0,
-//                'keyword_num' => $item['deploy_build']['keyword_num'] ?? 0,
-//                'article_num' => ($item['mysql_id'] != 0) ? APublicModel::getBlogNumByProjectId($item['id']) + APublicModel::getNewsNumByProjectId($item['id']) : 0,
-//                'task_finish_num' => Task::getNumByProjectId($item['id'], Task::STATUS_DOWN),
-//                'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
-//                'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
-//                'qa_status'=>$item['online_check']['qa_status'] ?? 0,
-//                'service_day'=>$item['deploy_build']['service_duration'] - $this->compliance_day($item['id']),
-//            ];
+        foreach ($list['list'] as $k => $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' => $managerLogic->getCacheName($item['deploy_build']['leader_mid'] ?? 0), //组长
+                'build_manager' => $managerLogic->getCacheName($item['deploy_build']['manager_mid'] ?? 0), //项目经理
+                'build_designer' => $managerLogic->getCacheName($item['deploy_build']['designer_mid'] ?? 0), //设计师
+                'build_tech' => $managerLogic->getCacheName($item['deploy_build']['tech_mid'] ?? 0), //技术助理
+                'optimize_manager' => $managerLogic->getCacheName($item['deploy_optimize']['manager_mid'] ?? 0), //优化服务经理
+                'optimize_optimist' => $managerLogic->getCacheName($item['deploy_optimize']['optimist_mid'] ?? 0), //优化师
+                'optimize_assist' => $managerLogic->getCacheName($item['deploy_optimize']['assist_mid'] ?? 0), //优化助理
+                'optimize_tech' => $managerLogic->getCacheName($item['deploy_optimize']['tech_mid'] ?? 0), //售后技术
+                'type' => $item['type'],
+                'test_domain' => $item['deploy_build']['test_domain'] ?? 0,
+                'plan' =>Project::planMap()[$item['deploy_build']['plan']],
+                'domain' => $item['deploy_optimize']['domain'] ?? 0,
+                'created_at' => date('Y年m月d日', strtotime($item['created_at'])),
+                'product_num' => ($item['mysql_id'] != 0) ? APublicModel::getProductNumByProjectId($item['id']) : 0,
+                'keyword_num' => $item['deploy_build']['keyword_num'] ?? 0,
+                'article_num' => ($item['mysql_id'] != 0) ? APublicModel::getBlogNumByProjectId($item['id']) + APublicModel::getNewsNumByProjectId($item['id']) : 0,
+                'task_finish_num' => Task::getNumByProjectId($item['id'], Task::STATUS_DOWN),
+                'task_pending_num' => Task::getNumByProjectId($item['id'], [Task::STATUS_DONGING, Task::STATUS_WAIT]),
+                'optimist_status'=>$item['online_check']['optimist_status'] ?? 0,
+                'qa_status'=>$item['online_check']['qa_status'] ?? 0,
+                'service_day'=>$item['deploy_build']['service_duration'] - $this->compliance_day($item['id']),
+            ];
+            $list['list'][$k] = $item;
         }
         }
         return $list;
         return $list;
     }
     }