hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/hant

Browse Source
This commit is contained in:
todaywindy 2025-07-02 15:28:14 +08:00
commit 3f26869c11
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/controller/Orderplan.php
View File

@ -92,7 +92,7 @@ class Orderplan extends Backend
'sum(total) total', 'sum(total) total',
'count(id) count', 'count(id) count',
'sum(performance) performance' 'sum(performance) performance'
])->limit(1); ])->where('status',\app\admin\model\Order::STATUS_FINISHED)->limit(1);
$res = $this->buildDate($build)->select(); $res = $this->buildDate($build)->select();
@ -137,7 +137,9 @@ class Orderplan extends Backend
'sum(total) total', 'sum(total) total',
'count(id) count', 'count(id) count',
'sum(performance) performance' 'sum(performance) performance'
])->group(' DATE(create_time)'); ])
->where('status',\app\admin\model\Order::STATUS_FINISHED)
->group(' DATE(create_time)');
$res = $this->buildDate($build)->select(); $res = $this->buildDate($build)->select();
$data = []; $data = [];