generated from liutk/owl-admin-base
Update
parent
2069b1f93a
commit
7131eac6fc
|
|
@ -91,18 +91,15 @@ class StatisticsController extends Controller
|
||||||
|
|
||||||
$input = $this->filterInput($request);
|
$input = $this->filterInput($request);
|
||||||
|
|
||||||
|
$dateRange1 = $request->input('start_at').','.$request->input('end_at');
|
||||||
|
$dateRange2 = $request->input('before_start_at').','.$request->input('before_end_at');
|
||||||
|
|
||||||
$ledger = $statisticService->ledger(
|
$ledger = $statisticService->ledger(
|
||||||
array_merge($input, [
|
array_merge($input, ['date_range' => $dateRange1])
|
||||||
'start_at' => $request->input('start_at'),
|
|
||||||
'end_at' => $request->input('end_at'),
|
|
||||||
])
|
|
||||||
);
|
);
|
||||||
|
|
||||||
$beforeLedger = $statisticService->ledger(
|
$beforeLedger = $statisticService->ledger(
|
||||||
array_merge($input, [
|
array_merge($input, ['date_range' => $dateRange2])
|
||||||
'start_at' => $request->input('before_start_at'),
|
|
||||||
'end_at' => $request->input('before_end_at'),
|
|
||||||
])
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// 销售涨幅
|
// 销售涨幅
|
||||||
|
|
@ -124,7 +121,7 @@ class StatisticsController extends Controller
|
||||||
DB::raw('SUM(sales) as sales'),
|
DB::raw('SUM(sales) as sales'),
|
||||||
DB::raw('SUM(expenditure) as expenditure'),
|
DB::raw('SUM(expenditure) as expenditure'),
|
||||||
])
|
])
|
||||||
->filter($input, LedgerItemFilter::class)
|
->filter(array_merge($input, ['date_range' => $dateRange1]), LedgerItemFilter::class)
|
||||||
->whereIn('ledger_item_type_id', $lotteryTypes->pluck('key'))
|
->whereIn('ledger_item_type_id', $lotteryTypes->pluck('key'))
|
||||||
->groupBy(['ledger_item_type_id'])
|
->groupBy(['ledger_item_type_id'])
|
||||||
->get()
|
->get()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue