作者 lyh

gx

@@ -173,14 +173,14 @@ class countProject extends Command @@ -173,14 +173,14 @@ class countProject extends Command
173 ->where('created_at','<=',$end_time) 173 ->where('created_at','<=',$end_time)
174 ->orderByRaw('diff ASC') 174 ->orderByRaw('diff ASC')
175 ->first(); 175 ->first();
176 - $data[$v]['min_project_count']['min_project_count'] = $min_info['diff']; 176 + $data[$v]['min_project_count'] = $min_info['diff'];
177 $max_info = $projectModel->select('*') 177 $max_info = $projectModel->select('*')
178 ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff') 178 ->selectRaw('DATEDIFF(STR_TO_DATE(uptime, "%Y-%m-%d"), STR_TO_DATE(created_at, "%Y-%m-%d")) AS diff')
179 ->whereNotNull('uptime') // 确保 uptime 字段不为空 179 ->whereNotNull('uptime') // 确保 uptime 字段不为空
180 ->where('created_at','<=',$end_time) 180 ->where('created_at','<=',$end_time)
181 ->orderByRaw('diff DESC') 181 ->orderByRaw('diff DESC')
182 ->first(); 182 ->first();
183 - $data[$v]['min_project_count']['max_project_count'] = $max_info['diff']; 183 + $data[$v]['min_project_count'] = $max_info['diff'];
184 $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2); 184 $data[$v]['average'] = ceil(($max_info['diff'] + $min_info['diff']) / 2);
185 } 185 }
186 return $data; 186 return $data;