合并分支 'lyh-server' 到 'master'
gx 查看合并请求 !1741
正在显示
1 个修改的文件
包含
4 行增加
和
1 行删除
| @@ -147,6 +147,8 @@ class OptimizeController extends BaseController | @@ -147,6 +147,8 @@ class OptimizeController extends BaseController | ||
| 147 | $data = APublicModel::getNumByProjectId($item['id']); | 147 | $data = APublicModel::getNumByProjectId($item['id']); |
| 148 | } | 148 | } |
| 149 | $manageModel = new ManageHr(); | 149 | $manageModel = new ManageHr(); |
| 150 | + $plan = Project::planMap(); | ||
| 151 | + $seo_plan = Project::seoMap(); | ||
| 150 | $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0); | 152 | $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0); |
| 151 | $item['build_leader'] = $manageModel->getName($item['leader_mid']); | 153 | $item['build_leader'] = $manageModel->getName($item['leader_mid']); |
| 152 | $item['build_manager'] = $manageModel->getName($item['manager_mid']); | 154 | $item['build_manager'] = $manageModel->getName($item['manager_mid']); |
| @@ -157,7 +159,8 @@ class OptimizeController extends BaseController | @@ -157,7 +159,8 @@ class OptimizeController extends BaseController | ||
| 157 | $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']); | 159 | $item['optimize_assist'] = $manageModel->getName($item['optimize_assist_mid']); |
| 158 | $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']); | 160 | $item['optimize_tech'] = $manageModel->getName($item['optimize_tech_mid']); |
| 159 | $item['quality_mid_name'] = $manageModel->getName($item['quality_mid']); | 161 | $item['quality_mid_name'] = $manageModel->getName($item['quality_mid']); |
| 160 | - $item['plan'] = Project::planMap()[$item['plan']]; | 162 | + $item['plan'] = $plan[$item['plan']] ?? 0; |
| 163 | + $item['seo_plan'] = $seo_plan[$item['plan']] ?? 0; | ||
| 161 | $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date'])); | 164 | $item['created_at'] = date('Y年m月d日', strtotime($item['cooperate_date'])); |
| 162 | $item['autologin_code'] = getAutoLoginCode($item['id']); | 165 | $item['autologin_code'] = getAutoLoginCode($item['id']); |
| 163 | $item['domain'] = 'https://'.$item['domain'].'/'; | 166 | $item['domain'] = 'https://'.$item['domain'].'/'; |
-
请 注册 或 登录 后发表评论