正在显示
1 个修改的文件
包含
2 行增加
和
1 行删除
| @@ -171,13 +171,14 @@ class countProject extends Command | @@ -171,13 +171,14 @@ class countProject extends Command | ||
| 171 | ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff') | 171 | ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff') |
| 172 | ->whereNotNull('uptime') // 确保 uptime 字段不为空 | 172 | ->whereNotNull('uptime') // 确保 uptime 字段不为空 |
| 173 | ->where('created_at','<=',$end_time) | 173 | ->where('created_at','<=',$end_time) |
| 174 | + ->whereBetween('created_at', [$start_time,$end_time]) | ||
| 174 | ->orderByRaw('diff ASC') | 175 | ->orderByRaw('diff ASC') |
| 175 | ->first(); | 176 | ->first(); |
| 176 | $data[$v]['min_project_count'] = $min_info['diff']; | 177 | $data[$v]['min_project_count'] = $min_info['diff']; |
| 177 | $max_info = $projectModel->select('*') | 178 | $max_info = $projectModel->select('*') |
| 178 | ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff') | 179 | ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff') |
| 179 | ->whereNotNull('uptime') // 确保 uptime 字段不为空 | 180 | ->whereNotNull('uptime') // 确保 uptime 字段不为空 |
| 180 | - ->where('created_at','<=',$end_time) | 181 | + ->whereBetween('created_at', [$start_time,$end_time]) |
| 181 | ->orderByRaw('diff DESC') | 182 | ->orderByRaw('diff DESC') |
| 182 | ->first(); | 183 | ->first(); |
| 183 | $data[$v]['max_project_count'] = $max_info['diff']; | 184 | $data[$v]['max_project_count'] = $max_info['diff']; |
-
请 注册 或 登录 后发表评论