正在显示
1 个修改的文件
包含
3 行增加
和
1 行删除
| @@ -47,10 +47,12 @@ class PrivateController extends BaseController | @@ -47,10 +47,12 @@ class PrivateController extends BaseController | ||
| 47 | public function optimizeProjectList(Request $request) | 47 | public function optimizeProjectList(Request $request) |
| 48 | { | 48 | { |
| 49 | $page_size = $request->input('page_size', 20); | 49 | $page_size = $request->input('page_size', 20); |
| 50 | - $field = ['gl_project.id', 'gl_project.company', 'gl_project.is_upgrade', 'b.start_date', 'd.domain', 'b.special']; | 50 | + $field = ['gl_project.id', 'gl_project.company', 'gl_project.is_upgrade', 'b.start_date', 'd.domain', 'b.special', 'f.industry_name']; |
| 51 | $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id') | 51 | $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id') |
| 52 | ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id') | 52 | ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id') |
| 53 | ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id') | 53 | ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id') |
| 54 | + ->leftJoin('gl_project_industry_related as e', 'gl_project.id', '=', 'e.project_id') | ||
| 55 | + ->leftJoin('gl_project_industry as f', 'e.industry_id', '=', 'f.id') | ||
| 54 | ->where('gl_project.type', Project::TYPE_TWO) | 56 | ->where('gl_project.type', Project::TYPE_TWO) |
| 55 | ->where('gl_project.project_type',Project::TYPE_ZERO) | 57 | ->where('gl_project.project_type',Project::TYPE_ZERO) |
| 56 | ->where('gl_project.extend_type', 0) // 是否续费是由extend_type字段控制 | 58 | ->where('gl_project.extend_type', 0) // 是否续费是由extend_type字段控制 |
-
请 注册 或 登录 后发表评论