| xqd
@@ -3,12 +3,16 @@
|
|
|
namespace App\Http\Controllers\Api\mini;
|
|
|
|
|
|
use App\Models\Device;
|
|
|
+use App\Models\DeviceName;
|
|
|
use App\Models\Order;
|
|
|
use App\Models\OrderDevice;
|
|
|
use App\Models\Project;
|
|
|
+use App\Models\RentType;
|
|
|
+use App\Models\Spec;
|
|
|
use Carbon\Carbon;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Support\Facades\Log;
|
|
|
+use phpDocumentor\Reflection\DocBlock;
|
|
|
|
|
|
class DataController extends BaseController
|
|
|
{
|
| xqd
@@ -401,6 +405,18 @@ class DataController extends BaseController
|
|
|
|
|
|
public function getMaxStat(Request $request)
|
|
|
{
|
|
|
+ $info = null;
|
|
|
+ if ($request->input('devices')!=null)
|
|
|
+ {
|
|
|
+ $devices = Device::where('id',$request->input('device_ids'))->value('name');
|
|
|
+ $device_name = DeviceName::where('id',$request->input('device_name_ids'))->value('name');
|
|
|
+ $spec_name = Spec::where('device_id',$request->input('device_ids'))->where('device_name_id',$request->input('device_name_ids'))->where('id',$request->input('spec_ids'))->value('name');
|
|
|
+ $rent_type = RentType::where('id',$request->input('rent_type_ids'))->value('name');
|
|
|
+ $info['device'] = $devices;
|
|
|
+ $info['device_name'] = $device_name;
|
|
|
+ $info['spec_name'] = $spec_name;
|
|
|
+ $info['rent_type'] = $rent_type;
|
|
|
+ }
|
|
|
$date = $request->input('date');
|
|
|
$date = $date ? $date : Carbon::now()->toDateString();
|
|
|
$start_at = Carbon::createFromTimeString($date . ' 00:00:00')->toDateTimeString();
|
| xqd
@@ -429,9 +445,21 @@ class DataController extends BaseController
|
|
|
$orderBy = $request->input('orderBy');
|
|
|
if($orderBy == 'asc') $projects = $projects->sortBy('max_price');
|
|
|
else $projects = $projects->sortByDesc('max_price');
|
|
|
- $values = $projects->pluck('max_price');
|
|
|
+ if ($info == null)
|
|
|
+ {
|
|
|
+ $values = $projects->pluck('max_price')->toArray();
|
|
|
+ foreach ($values as &$value)
|
|
|
+ {
|
|
|
+ $value = 0;
|
|
|
+ }
|
|
|
+// dd($values);
|
|
|
+ $values = 0;
|
|
|
+ }else
|
|
|
+ {
|
|
|
+ $values = $projects->pluck('max_price');
|
|
|
+ }
|
|
|
$names = $projects->pluck('name');
|
|
|
- return $this->success(['data' => compact('values', 'names')]);
|
|
|
+ return $this->success(['data' => compact('values', 'names','info')]);
|
|
|
}
|
|
|
|
|
|
public function projectStat(Request $request)
|