| xqd
@@ -128,7 +128,7 @@ class DataController extends BaseController
|
|
|
// year|month
|
|
|
$type = $request->input('type') ? $request->input('type') : 'year';
|
|
|
$cnt = 0;
|
|
|
- $projects = Project::whereIn('id', $this->project_ids)->get();
|
|
|
+ $projects = Project::whereIn('id', $this->project_ids)->where('id','!=',1)->get();
|
|
|
|
|
|
foreach($orders as $item) {
|
|
|
if($this->inDate($names, $item->created_at, $type)) {
|
| xqd
@@ -417,7 +417,7 @@ class DataController extends BaseController
|
|
|
}
|
|
|
}
|
|
|
$items = $items->get();
|
|
|
- $projects = Project::all();
|
|
|
+ $projects = Project::where('id','!=',1)->get();
|
|
|
foreach ($projects as $project) {
|
|
|
$project->max_price = $items->where('project_id', $project->id)->max('price') / 100;
|
|
|
}
|