正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
| @@ -167,9 +167,9 @@ class countProject extends Command | @@ -167,9 +167,9 @@ class countProject extends Command | ||
| 167 | $data[$v]['create_web_count'] = $projectModel->counts(['type'=>2,'deleted_status'=>0,'created_at'=>['<=',$end_time]]);//建站项目总数 | 167 | $data[$v]['create_web_count'] = $projectModel->counts(['type'=>2,'deleted_status'=>0,'created_at'=>['<=',$end_time]]);//建站项目总数 |
| 168 | $data[$v]['no_go_oline_count'] = $projectModel->counts(['uptime'=>null,'deleted_status'=>0,'created_at'=>['<=',$end_time]]);//未上线项目数量 | 168 | $data[$v]['no_go_oline_count'] = $projectModel->counts(['uptime'=>null,'deleted_status'=>0,'created_at'=>['<=',$end_time]]);//未上线项目数量 |
| 169 | $data[$v]['delete_project_count'] = $projectModel->counts(['deleted_status'=>1,'created_at'=>['<=',$end_time]]);//删除 | 169 | $data[$v]['delete_project_count'] = $projectModel->counts(['deleted_status'=>1,'created_at'=>['<=',$end_time]]);//删除 |
| 170 | - $min_info = $projectModel->select('diff')->selectRaw('(uptime - created_at) as diff')->where('uptime','!=',null)->where('created_at','<=',$end_time)->orderByRaw('diff ASC')->first(); | 170 | + $min_info = $projectModel->select('diff')->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')->where('uptime','!=',null)->where('created_at','<=',$end_time)->orderByRaw('diff ASC')->first(); |
| 171 | $data[$v]['min_project_count'] = $min_info['diff']; | 171 | $data[$v]['min_project_count'] = $min_info['diff']; |
| 172 | - $max_info = $projectModel->select('diff')->selectRaw('(uptime - created_at) as diff')->where('uptime','!=',null)->where('created_at','<=',$end_time)->orderByRaw('diff Desc')->first(); | 172 | + $max_info = $projectModel->select('diff')->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')->where('uptime','!=',null)->where('created_at','<=',$end_time)->orderByRaw('diff Desc')->first(); |
| 173 | $data[$v]['max_project_count'] = $max_info['diff']; | 173 | $data[$v]['max_project_count'] = $max_info['diff']; |
| 174 | $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2); | 174 | $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2); |
| 175 | } | 175 | } |
-
请 注册 或 登录 后发表评论